diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 12:39:13 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 12:39:13 -0500 |
commit | cab18d19bb05452fc7f5c45f7964643bdae80c92 (patch) | |
tree | 05069dedf6d4f1d2f77500e35d2e8abad42de164 /arch/arm/Kconfig | |
parent | c3e5dba4ee862a23c9f2273b9ddd492047cbfb15 (diff) | |
parent | 2cad6a8a4c31175578943f087e1dbef9f52e6ec3 (diff) |
Merge branch 'depends/gpio-devel' into next/soc
This is required for some of the clps711x series, so we're bringing in
the dependency explicitly.
By Linus Walleij (5) and others
via Linus Walleij
* depends/gpio-devel:
GPIO: clps711x: use platform_device_unregister in gpio_clps711x_init()
gpio/tc3589x: convert to use the simple irqdomain
gpio/em: convert to linear IRQ domain
gpio/mvebu: convert to use irq_domain_add_simple()
gpio/tegra: convert to use linear irqdomain
gpiolib: unlock on error in gpio_export()
gpiolib: add gpio get direction callback support
GPIO: clps711x: Fix direction logic for PORTD
GPIO: clps711x: Fix return value for gpio_clps711x_get
gpiolib: Refactor gpio_export
GPIO: vt8500: Add extended gpio bank for WM8505/WM8650
gpio: clps711x: delete local <mach/gpio.h> header
GPIO: Add support for GPIO on CLPS711X-target platform
DA9055 GPIO driver
gpio/gpio-omap: Use existing pointer to struct device
gpio/gpio-pl061: Covert to use devm_* functions
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 69d2844dd507..7441ebdf25f8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -367,6 +367,8 @@ config ARCH_CNS3XXX | |||
367 | 367 | ||
368 | config ARCH_CLPS711X | 368 | config ARCH_CLPS711X |
369 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" | 369 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" |
370 | select ARCH_REQUIRE_GPIOLIB | ||
371 | select ARCH_USES_GETTIMEOFFSET | ||
370 | select CLKDEV_LOOKUP | 372 | select CLKDEV_LOOKUP |
371 | select COMMON_CLK | 373 | select COMMON_CLK |
372 | select CPU_ARM720T | 374 | select CPU_ARM720T |