diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-05-28 07:52:58 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-05-28 07:52:58 +0200 |
commit | 1486a7409b42ec434be310e091ef68660a2f6cd0 (patch) | |
tree | aea9fb012b3d7221a4b46f50a10edf809ee49f9a /drivers/gpio/Makefile | |
parent | gpio/pch_gpio: Support new device ML7223 (diff) | |
parent | GPIO: OMAP: move to drivers/gpio (diff) | |
download | linux-1486a7409b42ec434be310e091ef68660a2f6cd0.tar.xz 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/Makefile | 1 |
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 |