Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

[linux-2.6] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 24e6bc09e7a7ade51bba7235baf6ca134a9c51f8..2b0ed89cd173728ddda8ad3ea201977c5ee0484c 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -52,6 +52,13 @@ config NO_IOPORT
 config NO_DMA
        def_bool SUN3
 
+config ARCH_SUPPORTS_AOUT
+       def_bool y
+
+config HZ
+       int
+       default 100
+
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
@@ -577,20 +584,6 @@ config MAC_HID
        depends on INPUT_ADBHID
        default y
 
-config MAC_ADBKEYCODES
-       bool "Support for ADB raw keycodes"
-       depends on INPUT_ADBHID
-       help
-         This provides support for sending raw ADB keycodes to console
-         devices.  This is the default up to 2.4.0, but in future this may be
-         phased out in favor of generic Linux keycodes.  If you say Y here,
-         you can dynamically switch via the
-         /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes
-         sysctl and with the "keyboard_sends_linux_keycodes=" kernel
-         argument.
-
-         If unsure, say Y here.
-
 config ADB_KEYBOARD
        bool "Support for ADB keyboard (old driver)"
        depends on MAC && !INPUT_ADBHID
@@ -678,8 +671,6 @@ endmenu
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/m68k/Kconfig.debug"
 
 source "security/Kconfig"