Merge branch 'for-rmk-misc' into for-rmk

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9722f8bb506cb9ad27f64b47ab15ce428886a0ba..fb2877526d58b8194b2e92839bdf2904dba84e5b 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -156,7 +156,6 @@ config ARCH_MTD_XIP
        bool
 
 config GENERIC_HARDIRQS_NO__DO_IRQ
-       bool
        def_bool y
 
 if OPROFILE
@@ -287,6 +286,8 @@ config ARCH_FOOTBRIDGE
 config ARCH_NETX
        bool "Hilscher NetX based"
        select ARM_VIC
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_TIME
        help
          This enables support for systems based on the Hilscher NetX Soc