diff options
| author | Russell King | 2008-10-09 22:33:02 +0200 |
|---|---|---|
| committer | Russell King | 2008-10-09 22:33:02 +0200 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /arch/arm/Kconfig | |
| parent | Merge branch 'at91' into devel (diff) | |
| parent | [ARM] 5239/1: Palm Zire 72 power management support (diff) | |
| download | kernel-qcow2-linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.tar.gz kernel-qcow2-linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.tar.xz kernel-qcow2-linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.zip | |
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 ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ - ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \ + ARCH_AT91 || ARCH_DAVINCI || \ ARCH_KS8695 || MACH_RD88F5182 help If you say Y here, the LEDs on your machine will be used |