Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 01dee84f840ac72608dae4fe0ea4997b3e911f81..55ea52fe6aca0a945328d8380f5b9672d583c7f8 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -5,6 +5,7 @@
 config M68K
        bool
        default y
 config M68K
        bool
        default y

+       select HAVE_IDE

 
 config MMU
        bool
 
 config MMU
        bool


@@ -43,7 +44,7 @@ config GENERIC_IOMAP
 
 config ARCH_MAY_HAVE_PC_FDC
        bool
 
 config ARCH_MAY_HAVE_PC_FDC
        bool

-       depends on Q40 || (BROKEN && SUN3X)
+       depends on BROKEN && (Q40 || SUN3X)

        default y
 
 config NO_IOPORT
        default y
 
 config NO_IOPORT


@@ -52,6 +53,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 +153,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


@@ -536,13 +539,6 @@ config AMIGA_BUILTIN_SERIAL
 
          To compile this driver as a module, choose M here.
 
 
          To compile this driver as a module, choose M here.
 

-config WHIPPET_SERIAL
-       tristate "Hisoft Whippet PCMCIA serial support"
-       depends on AMIGA_PCMCIA
-       help
-         HiSoft has a web page at <http://www.hisoft.co.uk/>, but there
-         is no listing for the Whippet in their Amiga section.
-

 config MULTIFACE_III_TTY
        tristate "Multiface Card III serial support"
        depends on AMIGA
 config MULTIFACE_III_TTY
        tristate "Multiface Card III serial support"
        depends on AMIGA


@@ -582,20 +578,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


@@ -683,8 +665,6 @@ endmenu
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "kernel/Kconfig.instrumentation"
-

 source "arch/m68k/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/m68k/Kconfig.debug"
 
 source "security/Kconfig"