diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:06:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:06:52 -0400 |
| commit | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (patch) | |
| tree | fc0516369f4146595c5dce9bddda23d8691c3f42 /arch/arm/Kconfig | |
| parent | 35437b6192d9a4eb92f095dfd72396b6d2970f0b (diff) | |
| parent | 92b797f6a1347623a41caf02516b70e5fa706a90 (diff) | |
Merge branch 'pxa-trizeps' into pxa-machines
Conflicts:
drivers/pcmcia/Makefile
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 70dba1668907..5e17953b673f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -845,7 +845,7 @@ config LEDS | |||
| 845 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ | 845 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ |
| 846 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ | 846 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ |
| 847 | ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ | 847 | ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ |
| 848 | ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \ | 848 | ARCH_AT91 || ARCH_DAVINCI || \ |
| 849 | ARCH_KS8695 || MACH_RD88F5182 | 849 | ARCH_KS8695 || MACH_RD88F5182 |
| 850 | help | 850 | help |
| 851 | If you say Y here, the LEDs on your machine will be used | 851 | If you say Y here, the LEDs on your machine will be used |