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 20a9c08e59c34ee34b21adb100b33014c99a39ff..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 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"
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"


@@ -145,11 +152,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 

-         The PCI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-

 config MAC
        bool "Macintosh support"
        depends on !MMU_SUN3
 config MAC
        bool "Macintosh support"
        depends on !MMU_SUN3


@@ -582,20 +584,6 @@ config MAC_HID
        depends on INPUT_ADBHID
        default y
 
        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
 config ADB_KEYBOARD
        bool "Support for ADB keyboard (old driver)"
        depends on MAC && !INPUT_ADBHID