[ARM] 4257/2: Kconfig support for GENERIC_CLOCKEVENTS

This time with LEDS_TIMER set with !GENERIC_CLOCKEVENTS

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e7baca29f3fb47f59cab05cf016b3f5cf25ebb26..2d13b016612116152e6eed96700010a70d988e5b 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -29,6 +29,10 @@ config GENERIC_TIME
        bool
        default n
 
        bool
        default n
 

+config GENERIC_CLOCKEVENTS
+       bool
+       default n
+

 config MMU
        bool
        default y
 config MMU
        bool
        default y


@@ -513,6 +517,8 @@ endmenu
 
 menu "Kernel Features"
 
 
 menu "Kernel Features"
 

+source "kernel/time/Kconfig"
+

 config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
        depends on EXPERIMENTAL && REALVIEW_MPCORE
 config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
        depends on EXPERIMENTAL && REALVIEW_MPCORE


@@ -572,6 +578,7 @@ config PREEMPT
 
 config NO_IDLE_HZ
        bool "Dynamic tick timer"
 
 config NO_IDLE_HZ
        bool "Dynamic tick timer"

+       depends on !GENERIC_CLOCKEVENTS

        help
          Select this option if you want to disable continuous timer ticks
          and have them programmed to occur as required. This option saves
        help
          Select this option if you want to disable continuous timer ticks
          and have them programmed to occur as required. This option saves


@@ -669,6 +676,7 @@ config LEDS_TIMER
        bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
                            MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
        depends on LEDS
        bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
                            MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
        depends on LEDS

+       depends on !GENERIC_CLOCKEVENTS

        default y if ARCH_EBSA110
        help
          If you say Y here, one of the system LEDs (the green one on the
        default y if ARCH_EBSA110
        help
          If you say Y here, one of the system LEDs (the green one on the