Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[sfrench/cifs-2.6.git] / arch / h8300 / Kconfig

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index ff6a8712bd6d8c3f59f7724050d9793a22db3fcf..085dc6ec152b057b6da23c2742a39d0a0012c327 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -8,6 +8,7 @@ mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration"
 config H8300
        bool
        default y
+       select HAVE_IDE
 
 config MMU
        bool
@@ -65,6 +66,9 @@ config TIME_LOW_RES
        bool
        default y
 
+config ARCH_SUPPORTS_AOUT
+       def_bool y
+
 config NO_IOPORT
        def_bool y
 
@@ -79,6 +83,10 @@ config PCI
        bool
        default n
 
+config HZ
+       int
+       default 100
+
 source "init/Kconfig"
 
 source "arch/h8300/Kconfig.cpu"
@@ -223,8 +231,6 @@ endmenu
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/h8300/Kconfig.debug"
 
 source "security/Kconfig"