Merge with ../linux-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 11fff042aa817d022139947e82093d24a3e567a4..6122a4ec13293fede97c74a528f4d754681d5892 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -231,6 +231,8 @@ source "arch/arm/plat-omap/Kconfig"
 
 source "arch/arm/mach-omap1/Kconfig"
 
+source "arch/arm/mach-omap2/Kconfig"
+
 source "arch/arm/mach-s3c2410/Kconfig"
 
 source "arch/arm/mach-lh7a40x/Kconfig"
@@ -402,8 +404,7 @@ config LEDS
          system, but the driver will do nothing.
 
 config LEDS_TIMER
-       bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
-                           MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
+       bool "Timer LED" if !ARCH_CDB89712
        depends on LEDS
        default y if ARCH_EBSA110
        help
@@ -418,8 +419,7 @@ config LEDS_TIMER
          will overrule the CPU usage LED.
 
 config LEDS_CPU
-       bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
-                       !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
+       bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110)
        depends on LEDS
        help
          If you say Y here, the red LED will be used to give a good real
@@ -731,6 +731,8 @@ source "drivers/usb/Kconfig"
 
 source "drivers/mmc/Kconfig"
 
+source "drivers/ssi/Kconfig"
+
 endmenu
 
 source "fs/Kconfig"