diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:46:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:46:42 -0400 |
| commit | efa62e1355f0495f37f1296754b8880947c8da72 (patch) | |
| tree | c07af29f8baf2e6f4ed3bedbe46d405924edd530 /arch/arm/Kconfig | |
| parent | 107532920226a37e595697959b2a6a823cfa2497 (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
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 | |||
| 836 | select CLKDEV_LOOKUP | 836 | select CLKDEV_LOOKUP |
| 837 | select HAVE_MACH_CLKDEV | 837 | select HAVE_MACH_CLKDEV |
| 838 | select GENERIC_GPIO | 838 | select GENERIC_GPIO |
| 839 | select ARCH_REQUIRE_GPIOLIB | ||
| 839 | help | 840 | help |
| 840 | Support for ST-Ericsson U300 series mobile platforms. | 841 | Support for ST-Ericsson U300 series mobile platforms. |
| 841 | 842 | ||