diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-01-20 08:31:52 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-01-20 08:31:52 -0500 |
| commit | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (patch) | |
| tree | 256bcce2b13a45b573b02ef73dcebe1f08a03593 /drivers/leds/Kconfig | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| parent | 8d09a1bb3147ddbcf0a9483021ca699c54c54732 (diff) | |
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 | |||
| 74 | This option enables support for LEDs connected to GPIO lines | 74 | This option enables support for LEDs connected to GPIO lines |
| 75 | on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440. | 75 | on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440. |
| 76 | 76 | ||
| 77 | config LEDS_AMS_DELTA | ||
| 78 | tristate "LED Support for the Amstrad Delta (E3)" | ||
| 79 | depends on LEDS_CLASS | ||
| 80 | depends on MACH_AMS_DELTA | ||
| 81 | help | ||
| 82 | This option enables support for the LEDs on Amstrad Delta (E3). | ||
| 83 | |||
| 84 | config LEDS_NET48XX | 77 | config LEDS_NET48XX |
| 85 | tristate "LED Support for Soekris net48xx series Error LED" | 78 | tristate "LED Support for Soekris net48xx series Error LED" |
| 86 | depends on LEDS_CLASS | 79 | depends on LEDS_CLASS |