x86: fold apic_ops into genapic

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1f08b29b66b95611a7365b3feb626fd553d78267..dbfdf87f993f8849b44e16e0000384bb24d116f6 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
@@ -288,6 +287,8 @@ config ARCH_NETX
        bool "Hilscher NetX based"
        select CPU_ARM926T
        select ARM_VIC
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_TIME
        help
          This enables support for systems based on the Hilscher NetX Soc
 
@@ -1324,6 +1325,8 @@ source "drivers/regulator/Kconfig"
 
 source "drivers/uio/Kconfig"
 
+source "drivers/staging/Kconfig"
+
 endmenu
 
 source "fs/Kconfig"