diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-01-20 13:31:52 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-01-20 13:31:52 (GMT) |
| commit | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (patch) | |
| tree | 256bcce2b13a45b573b02ef73dcebe1f08a03593 /arch/arm/mach-omap1/Kconfig | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| parent | 8d09a1bb3147ddbcf0a9483021ca699c54c54732 (diff) | |
| download | linux-967809bd7faf71ddc29c8081e0f21db8b201a0f4.tar.xz | |
Merge branch 'omap1-part2' into omap1
Conflicts:
drivers/leds/leds-ams-delta.c
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 4f8d66f..5b1edba 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. |