Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / arch / m68k / Kconfig.devices

diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index d964dc4c2ce81f9217d38fd5f1b98a10315804e7..d214034be6a6ab6e1fc9d832eab2d995f0d7baf0 100644 (file)
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -77,32 +77,6 @@ config MULTIFACE_III_TTY
 
          To compile this driver as a module, choose M here.
 
-config GVPIOEXT
-       tristate "GVP IO-Extender support"
-       depends on PARPORT=n && ZORRO
-       help
-         If you want to use a GVP IO-Extender serial card in Linux, say Y.
-         Otherwise, say N.
-
-config GVPIOEXT_LP
-       tristate "GVP IO-Extender parallel printer support"
-       depends on GVPIOEXT
-       help
-         Say Y to enable driving a printer from the parallel port on your
-         GVP IO-Extender card, N otherwise.
-
-config GVPIOEXT_PLIP
-       tristate "GVP IO-Extender PLIP support"
-       depends on GVPIOEXT
-       help
-         Say Y to enable doing IP over the parallel port on your GVP
-         IO-Extender card, N otherwise.
-
-config MAC_HID
-       bool
-       depends on INPUT_ADBHID
-       default y
-
 config HPDCA
        tristate "HP DCA serial support"
        depends on DIO && SERIAL_8250
@@ -117,35 +91,13 @@ config HPAPCI
          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 && BROKEN
-       help
-         This is the driver for the serial ports on the Motorola MVME147
-         boards.  Everyone using one of these boards should say Y here.
-
-config MVME162_SCC
-       bool "SCC support for MVME162 serial ports"
-       depends on MVME16x && BROKEN
-       help
-         This is the driver for the serial ports on the Motorola MVME162 and
-         172 boards.  Everyone using one of these boards should say Y here.
-
-config BVME6000_SCC
-       bool "SCC support for BVME6000 serial ports"
-       depends on BVME6000 && BROKEN
-       help
-         This is the driver for the serial ports on the BVME4000 and BVME6000
-         boards from BVM Ltd.  Everyone using one of these boards should say
-         Y here.
-
 config DN_SERIAL
        bool "Support for DN serial port (dummy)"
        depends on APOLLO
 
 config SERIAL_CONSOLE
        bool "Support for serial port console"
-       depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
+       depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || SERIAL167 || 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