Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index fc2c3d0..7775257 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -10,16 +10,29 @@ config MMU
        bool
        default y
 
-config UID16
+config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 
-config RWSEM_GENERIC_SPINLOCK
+config RWSEM_XCHGADD_ALGORITHM
+       bool
+
+config GENERIC_HWEIGHT
        bool
        default y
 
-config RWSEM_XCHGADD_ALGORITHM
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
+config TIME_LOW_RES
+       bool
+       default y
+
+config ARCH_MAY_HAVE_PC_FDC
        bool
+       depends on Q40 || (BROKEN && SUN3X)
+       default y
 
 mainmenu "Linux/68k Kernel Configuration"
 
@@ -185,17 +198,19 @@ config BVME6000
          drivers for SCSI, Ethernet and serial ports later on.
 
 config HP300
-       bool "HP9000/300 support"
+       bool "HP9000/300 and HP9000/400 support"
        depends on !MMU_SUN3
        help
-         This option enables support for the HP9000/300 series of
-         workstations. Support for these machines is still very experimental.
-         If you plan to try to use the kernel on such a machine say Y here.
+         This option enables support for the HP9000/300 and HP9000/400 series
+         of workstations. Support for these machines is still somewhat
+         experimental. If you plan to try to use the kernel on such a machine
+         say Y here.
          Everybody else says N.
 
 config DIO
        bool "DIO bus support"
        depends on HP300
+       default y
        help
          Say Y here to enable support for the "DIO" expansion bus used in
          HP300 machines. If you are using such a system you almost certainly
@@ -351,6 +366,8 @@ config 060_WRITETHROUGH
          is hardwired on.  The 53c710 SCSI driver is known to suffer from
          this problem.
 
+source "mm/Kconfig"
+
 endmenu
 
 menu "General setup"
@@ -375,33 +392,11 @@ config AMIGA_PCMCIA
          Include support in the kernel for pcmcia on Amiga 1200 and Amiga
          600. If you intend to use pcmcia cards say Y; otherwise say N.
 
-config STRAM_SWAP
-       bool "Support for ST-RAM as swap space"
-       depends on ATARI && BROKEN
-       ---help---
-         Some Atari 68k macines (including the 520STF and 1020STE) divide
-         their addressible memory into ST and TT sections.  The TT section
-         (up to 512MB) is the main memory; the ST section (up to 4MB) is
-         accessible to the built-in graphics board, runs slower, and is
-         present mainly for backward compatibility with older machines.
-
-         This enables support for using (parts of) ST-RAM as swap space,
-         instead of as normal system memory. This can first enhance system
-         performance if you have lots of alternate RAM (compared to the size
-         of ST-RAM), because executable code always will reside in faster
-         memory. ST-RAM will remain as ultra-fast swap space. On the other
-         hand, it allows much improved dynamic allocations of ST-RAM buffers
-         for device driver modules (e.g. floppy, ACSI, SLM printer, DMA
-         sound). The probability that such allocations at module load time
-         fail is drastically reduced.
-
 config STRAM_PROC
        bool "ST-RAM statistics in /proc"
        depends on ATARI
        help
-         Say Y here to report ST-RAM usage statistics in /proc/stram.  See
-         the help for CONFIG_STRAM_SWAP for discussion of ST-RAM and its
-         uses.
+         Say Y here to report ST-RAM usage statistics in /proc/stram.
 
 config HEARTBEAT
        bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40
@@ -442,6 +437,8 @@ source "drivers/zorro/Kconfig"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 menu "Character devices"
@@ -582,11 +579,18 @@ config ADB_KEYBOARD
 
 config HPDCA
        tristate "HP DCA serial support"
-       depends on DIO
+       depends on DIO && SERIAL_8250
        help
          If you want to use the internal "DCA" serial ports on an HP300
          machine, say Y here.
 
+config HPAPCI
+       tristate "HP APCI serial support"
+       depends on HP300 && SERIAL_8250 && EXPERIMENTAL
+       help
+         If you want to use the internal "APCI" serial ports on an HP400
+         machine, say Y here.
+
 config MVME147_SCC
        bool "SCC support for MVME147 serial ports"
        depends on MVME147
@@ -623,7 +627,7 @@ config DN_SERIAL
 
 config SERIAL_CONSOLE
        bool "Support for serial port console"
-       depends on (AMIGA || ATARI || MAC || HP300 || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_SCC=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || HPDCA=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
+       depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_SCC=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
        ---help---
          If you say Y here, it will be possible to use a serial port as the
          system console (the system console is the device which receives all