Merge branch 'sa1100'

[karo-tx-linux.git] / arch / m32r / Kconfig

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index e0118c4bc08223785b390a77cee0029823f052ae..de153de2ea9f34df702bcbd7c915ee119e9bac53 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -8,6 +8,8 @@ mainmenu "Linux/M32R Kernel Configuration"
 config M32R
        bool
        default y
+       select HAVE_IDE
+       select HAVE_OPROFILE
 
 config SBUS
        bool
@@ -34,6 +36,13 @@ config NO_IOPORT
 config NO_DMA
        def_bool y
 
+config ARCH_SUPPORTS_AOUT
+       def_bool y
+
+config HZ
+       int
+       default 100
+
 source "init/Kconfig"
 
 
@@ -425,8 +434,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/m32r/Kconfig.debug"
 
 source "security/Kconfig"