Merge branch 'linus' into x86/paravirt-spinlocks

[linux-2.6] / arch / frv / Kconfig

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 96f7d70..a5aac1b 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -5,6 +5,7 @@
 config FRV
        bool
        default y
+       select HAVE_IDE
 
 config ZONE_DMA
        bool
@@ -57,6 +58,10 @@ config ARCH_HAS_ILOG2_U64
        bool
        default y
 
+config HZ
+       int
+       default 1000
+
 mainmenu "Fujitsu FR-V Kernel Configuration"
 
 source "init/Kconfig"