diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-02 18:57:03 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 04:36:33 -0500 |
| commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
| tree | 31894d9dc2c29f31234e479de520a50858cce54c /drivers/leds | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 8c3d7c30c306d83ff9c303f42307765a5a7bc254 (diff) | |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 9ca28fced2b9..28b27ad57a19 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
| @@ -69,7 +69,7 @@ config LEDS_MIKROTIK_RB532 | |||
| 69 | config LEDS_S3C24XX | 69 | config LEDS_S3C24XX |
| 70 | tristate "LED Support for Samsung S3C24XX GPIO LEDs" | 70 | tristate "LED Support for Samsung S3C24XX GPIO LEDs" |
| 71 | depends on LEDS_CLASS | 71 | depends on LEDS_CLASS |
| 72 | depends on ARCH_S3C2410 | 72 | depends on ARCH_S3C24XX |
| 73 | help | 73 | help |
| 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. |