diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-01-20 14:31:52 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-01-20 14:31:52 +0100 |
| commit | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (patch) | |
| tree | 256bcce2b13a45b573b02ef73dcebe1f08a03593 /drivers/leds/Kconfig | |
| parent | Linux 3.3-rc1 (diff) | |
| parent | input: serio: ams-delta: toggle keyboard power over GPIO (diff) | |
| download | linux-967809bd7faf71ddc29c8081e0f21db8b201a0f4.tar.xz linux-967809bd7faf71ddc29c8081e0f21db8b201a0f4.zip | |
Merge branch 'omap1-part2' into omap1
Conflicts:
drivers/leds/leds-ams-delta.c
Diffstat (limited to 'drivers/leds/Kconfig')
| -rw-r--r-- | drivers/leds/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index c957c344233f..5234db9d3fbf 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -74,13 +74,6 @@ config LEDS_S3C24XX This option enables support for LEDs connected to GPIO lines on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440. -config LEDS_AMS_DELTA - tristate "LED Support for the Amstrad Delta (E3)" - depends on LEDS_CLASS - depends on MACH_AMS_DELTA - help - This option enables support for the LEDs on Amstrad Delta (E3). - config LEDS_NET48XX tristate "LED Support for Soekris net48xx series Error LED" depends on LEDS_CLASS |