diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:04:51 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:05:06 +0100 |
commit | 07b98403ee67838bbaded43bd687875b9d7f74e0 (patch) | |
tree | 0b1f155ae4628a2be4dc4dd4c7fbeeaf1d8016dc /drivers/gpio | |
parent | net: macb: fix build break with !CONFIG_OF (diff) | |
parent | Merge branch 'hwmod' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/... (diff) | |
download | linux-07b98403ee67838bbaded43bd687875b9d7f74e0.tar.xz linux-07b98403ee67838bbaded43bd687875b9d7f74e0.zip |
Merge branch 'omap/hwmod' into next/drivers
This is needed as a dependency for omap/ehci.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 5b2b9e26f49c..8ef9e9abe970 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_ARCH_DAVINCI) += gpio-davinci.o obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o -obj-$(CONFIG_MACH_KS8695) += gpio-ks8695.o +obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o obj-$(CONFIG_GPIO_LANGWELL) += gpio-langwell.o obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o |