Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[pandora-kernel.git] / arch / frv / Kconfig

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index f6bcb03..f6037b2 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -5,6 +5,7 @@ config FRV
        select HAVE_ARCH_TRACEHOOK
        select HAVE_IRQ_WORK
        select HAVE_PERF_EVENTS
+       select HAVE_GENERIC_HARDIRQS
 
 config ZONE_DMA
        bool
@@ -21,21 +22,17 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
-config GENERIC_HWEIGHT
+config GENERIC_FIND_BIT_LE
        bool
        default y
 
-config GENERIC_CALIBRATE_DELAY
-       bool
-       default n
-
-config GENERIC_HARDIRQS
+config GENERIC_HWEIGHT
        bool
        default y
 
-config GENERIC_HARDIRQS_NO__DO_IRQ
+config GENERIC_CALIBRATE_DELAY
        bool
-       default y
+       default n
 
 config TIME_LOW_RES
        bool