diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /arch/arm/Kconfig | |
| parent | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (diff) | |
| parent | fda50a1c49ad7483eaa29a268d560422c413933f (diff) | |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
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 744d07e69602..960d5a54aec3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -876,7 +876,7 @@ config LEDS | |||
| 876 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ | 876 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ |
| 877 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ | 877 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ |
| 878 | ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ | 878 | ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ |
| 879 | ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \ | 879 | ARCH_AT91 || ARCH_DAVINCI || \ |
| 880 | ARCH_KS8695 || MACH_RD88F5182 | 880 | ARCH_KS8695 || MACH_RD88F5182 |
| 881 | help | 881 | help |
| 882 | If you say Y here, the LEDs on your machine will be used | 882 | If you say Y here, the LEDs on your machine will be used |