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 16a2e6a..6c8452e 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -34,7 +34,7 @@ config PARPORT
 
 config PARPORT_PC
        tristate "PC-style hardware"
-       depends on PARPORT && (!SPARC64 || PCI) && !SPARC32
+       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
@@ -48,7 +48,7 @@ config PARPORT_PC
 
 config PARPORT_SERIAL
        tristate "Multi-IO cards (parallel and serial)"
-       depends on SERIAL_8250 && PARPORT_PC && 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
@@ -77,7 +77,7 @@ config PARPORT_PC_SUPERIO
 
 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.
@@ -90,6 +90,15 @@ config PARPORT_ARC
        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
@@ -121,6 +130,7 @@ config PARPORT_GSC
        tristate
        default GSC
        depends on PARPORT
+       select PARPORT_NOT_PC
 
 config PARPORT_SUNBPP
        tristate "Sparc hardware (EXPERIMENTAL)"