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] / drivers / parport / Kconfig

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 31dc05d..6c8452e 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -34,7 +34,7 @@ config PARPORT
 
 config PARPORT_PC
        tristate "PC-style hardware"
 
 config PARPORT_PC
        tristate "PC-style hardware"

-       depends on PARPORT && (!SPARC64 || PCI) && (!SPARC32 || BROKEN)
+       depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV

        ---help---
          You should say Y here if you have a PC-style parallel port. All
          IBM PC compatible computers and some Alphas have PC-style
        ---help---
          You should say Y here if you have a PC-style parallel port. All
          IBM PC compatible computers and some Alphas have PC-style


@@ -46,15 +46,9 @@ config PARPORT_PC
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

-config PARPORT_PC_CML1
-       tristate
-       depends on PARPORT!=n && PARPORT_PC!=n
-       default PARPORT_PC if SERIAL_8250=y
-       default m if SERIAL_8250=m
-

 config PARPORT_SERIAL
        tristate "Multi-IO cards (parallel and serial)"
 config PARPORT_SERIAL
        tristate "Multi-IO cards (parallel and serial)"

-       depends on SERIAL_8250!=n && PARPORT_PC_CML1 && PCI
+       depends on SERIAL_8250_PCI && PARPORT_PC && PCI

        help
          This adds support for multi-IO PCI cards that have parallel and
          serial ports.  You should say Y or M here.  If you say M, the module
        help
          This adds support for multi-IO PCI cards that have parallel and
          serial ports.  You should say Y or M here.  If you say M, the module


@@ -83,18 +77,32 @@ config PARPORT_PC_SUPERIO
 
 config PARPORT_PC_PCMCIA
        tristate "Support for PCMCIA management for PC-style ports"
 
 config PARPORT_PC_PCMCIA
        tristate "Support for PCMCIA management for PC-style ports"

-       depends on PARPORT!=n && (PCMCIA!=n && PARPORT_PC=m && PARPORT_PC || PARPORT_PC=y && PCMCIA)
+       depends on PCMCIA && PARPORT_PC

        help
          Say Y here if you need PCMCIA support for your PC-style parallel
          ports. If unsure, say N.
 
        help
          Say Y here if you need PCMCIA support for your PC-style parallel
          ports. If unsure, say N.
 

+config PARPORT_NOT_PC
+       bool
+

 config PARPORT_ARC
        tristate "Archimedes hardware"
        depends on ARM && PARPORT
 config PARPORT_ARC
        tristate "Archimedes hardware"
        depends on ARM && PARPORT

+       select PARPORT_NOT_PC
+
+config PARPORT_IP32
+       tristate "SGI IP32 builtin port (EXPERIMENTAL)"
+       depends on SGI_IP32 && PARPORT && EXPERIMENTAL
+       select PARPORT_NOT_PC
+       help
+         Say Y here if you need support for the parallel port on
+         SGI O2 machines. This code is also available as a module (say M),
+         called parport_ip32.  If in doubt, saying N is the safe plan.

 
 config PARPORT_AMIGA
        tristate "Amiga builtin port"
        depends on AMIGA && PARPORT
 
 config PARPORT_AMIGA
        tristate "Amiga builtin port"
        depends on AMIGA && PARPORT

+       select PARPORT_NOT_PC

        help
          Say Y here if you need support for the parallel port hardware on
          Amiga machines. This code is also available as a module (say M),
        help
          Say Y here if you need support for the parallel port hardware on
          Amiga machines. This code is also available as a module (say M),


@@ -103,6 +111,7 @@ config PARPORT_AMIGA
 config PARPORT_MFC3
        tristate "Multiface III parallel port"
        depends on ZORRO && PARPORT
 config PARPORT_MFC3
        tristate "Multiface III parallel port"
        depends on ZORRO && PARPORT

+       select PARPORT_NOT_PC

        help
          Say Y here if you need parallel port support for the MFC3 card.
          This code is also available as a module (say M), called
        help
          Say Y here if you need parallel port support for the MFC3 card.
          This code is also available as a module (say M), called


@@ -111,6 +120,7 @@ config PARPORT_MFC3
 config PARPORT_ATARI
        tristate "Atari hardware"
        depends on ATARI && PARPORT
 config PARPORT_ATARI
        tristate "Atari hardware"
        depends on ATARI && PARPORT

+       select PARPORT_NOT_PC

        help
          Say Y here if you need support for the parallel port hardware on
          Atari machines. This code is also available as a module (say M),
        help
          Say Y here if you need support for the parallel port hardware on
          Atari machines. This code is also available as a module (say M),


@@ -118,27 +128,19 @@ config PARPORT_ATARI
 
 config PARPORT_GSC
        tristate
 
 config PARPORT_GSC
        tristate

-       depends on GSC
-       default PARPORT
+       default GSC
+       depends on PARPORT
+       select PARPORT_NOT_PC

 
 config PARPORT_SUNBPP
        tristate "Sparc hardware (EXPERIMENTAL)"
 
 config PARPORT_SUNBPP
        tristate "Sparc hardware (EXPERIMENTAL)"

-       depends on SBUS && EXPERIMENTAL && PARPORT
+       depends on SBUS && PARPORT && EXPERIMENTAL
+       select PARPORT_NOT_PC

        help
          This driver provides support for the bidirectional parallel port
          found on many Sun machines. Note that many of the newer Ultras
          actually have pc style hardware instead.
 
        help
          This driver provides support for the bidirectional parallel port
          found on many Sun machines. Note that many of the newer Ultras
          actually have pc style hardware instead.
 

-# If exactly one hardware type is selected then parport will optimise away
-# support for loading any others.  Defeat this if the user is keen.
-config PARPORT_OTHER
-       bool "Support foreign hardware"
-       depends on PARPORT
-       help
-         Say Y here if you want to be able to load driver modules to support
-         other non-standard types of parallel ports. This causes a
-         performance loss, so most people say N.
-

 config PARPORT_1284
        bool "IEEE 1284 transfer modes"
        depends on PARPORT
 config PARPORT_1284
        bool "IEEE 1284 transfer modes"
        depends on PARPORT