diff options
author | Arnd Bergmann | 2011-10-31 23:46:42 +0100 |
---|---|---|
committer | Arnd Bergmann | 2011-10-31 23:46:42 +0100 |
commit | efa62e1355f0495f37f1296754b8880947c8da72 (patch) | |
tree | c07af29f8baf2e6f4ed3bedbe46d405924edd530 /arch/arm/Kconfig | |
parent | Merge branch 'tegra/devel' into next/devel (diff) | |
parent | ARM: 7104/1: plat-pxa: break out GPIO driver specifics (diff) | |
download | kernel-qcow2-linux-efa62e1355f0495f37f1296754b8880947c8da72.tar.gz kernel-qcow2-linux-efa62e1355f0495f37f1296754b8880947c8da72.tar.xz kernel-qcow2-linux-efa62e1355f0495f37f1296754b8880947c8da72.zip |
Merge branch 'depends/rmk/gpio' into next/devel
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3bf38c84fd23..11391a4eca0b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -836,6 +836,7 @@ config ARCH_U300 select CLKDEV_LOOKUP select HAVE_MACH_CLKDEV select GENERIC_GPIO + select ARCH_REQUIRE_GPIOLIB help Support for ST-Ericsson U300 series mobile platforms. |