vserver 1.9.5.x5

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

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index fc2c3d0..22a76f8 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -21,6 +21,10 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
@@ -185,17 +189,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
@@ -379,8 +385,8 @@ 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
+         Some Atari 68k machines (including the 520STF and 1020STE) divide
+         their addressable 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.
@@ -582,11 +588,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 +636,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