Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[linux-2.6] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 90d8013315861b7544b217f830225771de062f93..9389d38f222f2f749497b106872278a7da5bdd0b 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -54,6 +54,11 @@ config FORCE_MAX_ZONEORDER
 config CRIS
        bool
        default y
+       select HAVE_IDE
+
+config HZ
+       int
+       default 100
 
 source "init/Kconfig"