diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 22:05:03 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-29 22:05:03 +0100 |
commit | 235ecf4c59ebe13e065a40755d999fa9850b8179 (patch) | |
tree | fc1048fe799b67413bb5716c1f0775f188500822 /arch/arm/mach-omap1/Kconfig | |
parent | Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/bo... (diff) | |
parent | Merge branch 'omap1-part2' into omap1 (diff) | |
download | linux-235ecf4c59ebe13e065a40755d999fa9850b8179.tar.xz linux-235ecf4c59ebe13e065a40755d999fa9850b8179.zip |
Merge branch 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
* 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
input: serio: ams-delta: toggle keyboard power over GPIO
omapfb: lcd_ams_delta: drive control lines over GPIO
MTD: NAND: ams-delta: use GPIO instead of custom I/O
LED: drop leds-ams-delta driver
ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
ARM: OMAP1: ams-delta: register latch dependent devices later
Diffstat (limited to 'arch/arm/mach-omap1/Kconfig')
-rw-r--r-- | arch/arm/mach-omap1/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 4f8d66f044e7..5b1edbae6893 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -155,6 +155,8 @@ config MACH_AMS_DELTA bool "Amstrad E3 (Delta)" depends on ARCH_OMAP1 && ARCH_OMAP15XX select FIQ + select GPIO_GENERIC_PLATFORM + select LEDS_GPIO_REGISTER help Support for the Amstrad E3 (codename Delta) videophone. Say Y here if you have such a device. |