summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/Makefile
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-05-27 23:52:58 -0600
committerGrant Likely <grant.likely@secretlab.ca>2011-05-27 23:52:58 -0600
commit1486a7409b42ec434be310e091ef68660a2f6cd0 (patch)
treeaea9fb012b3d7221a4b46f50a10edf809ee49f9a /drivers/gpio/Makefile
parentbc786ccead15262a12bd673ed7a5afa6cbf0edcf (diff)
parente5cdb13ff95e1400bc94d3e6610fc5e95be3b5b1 (diff)
downloadblackbird-op-linux-1486a7409b42ec434be310e091ef68660a2f6cd0.tar.gz
blackbird-op-linux-1486a7409b42ec434be310e091ef68660a2f6cd0.zip
Merge branch 'for_2.6.40/gpio-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
Diffstat (limited to 'drivers/gpio/Makefile')
-rw-r--r--drivers/gpio/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 7d5b5470ed0d..4182040a3522 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_GPIO_MAX732X) += max732x.o
obj-$(CONFIG_GPIO_MC33880) += mc33880.o
obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o
obj-$(CONFIG_GPIO_74X164) += 74x164.o
+obj-$(CONFIG_ARCH_OMAP) += gpio-omap.o
obj-$(CONFIG_GPIO_PCA953X) += pca953x.o
obj-$(CONFIG_GPIO_PCF857X) += pcf857x.o
obj-$(CONFIG_GPIO_PCH) += pch_gpio.o
OpenPOWER on IntegriCloud