ppc/hdpu: remove dead IDE code

[safe/jmp/linux-2.6] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index b8536c7..65db226 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -5,6 +5,7 @@
 config M68K
        bool
        default y
+       select HAVE_IDE
 
 config MMU
        bool
@@ -37,6 +38,10 @@ config TIME_LOW_RES
        bool
        default y
 
+config GENERIC_IOMAP
+       bool
+       default y
+
 config ARCH_MAY_HAVE_PC_FDC
        bool
        depends on Q40 || (BROKEN && SUN3X)
@@ -45,6 +50,16 @@ config ARCH_MAY_HAVE_PC_FDC
 config NO_IOPORT
        def_bool y
 
+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"
@@ -138,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.
 
-         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
@@ -355,8 +365,9 @@ config RMW_INSNS
          adventurous.
 
 config SINGLE_MEMORY_CHUNK
-       bool "Use one physical chunk of memory only"
-       depends on ADVANCED && !SUN3
+       bool "Use one physical chunk of memory only" if ADVANCED && !SUN3
+       default y if SUN3
+       select NEED_MULTIPLE_NODES
        help
          Ignore all but the first contiguous chunk of physical memory for VM
          purposes.  This will save a few bytes kernel size and may speed up
@@ -377,6 +388,14 @@ config 060_WRITETHROUGH
          is hardwired on.  The 53c710 SCSI driver is known to suffer from
          this problem.
 
+config ARCH_DISCONTIGMEM_ENABLE
+       def_bool !SINGLE_MEMORY_CHUNK
+
+config NODES_SHIFT
+       int
+       default "3"
+       depends on !SINGLE_MEMORY_CHUNK
+
 source "mm/Kconfig"
 
 endmenu
@@ -409,9 +428,6 @@ config STRAM_PROC
        help
          Say Y here to report ST-RAM usage statistics in /proc/stram.
 
-config ATARI_KBD_CORE
-       bool
-
 config HEARTBEAT
        bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40
        default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300
@@ -569,20 +585,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