Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6] / drivers / parport / Kconfig

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index a665951b1586c4e53d4f280407cf7c27615f9fdf..4d8dc27ea9d199043c36c85bdad8a3ca507135f8 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -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
@@ -85,10 +85,14 @@ config PARPORT_PC_PCMCIA
 config PARPORT_NOT_PC
        bool
 
-config PARPORT_ARC
-       tristate "Archimedes hardware"
-       depends on ARM && PARPORT
+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"
@@ -121,6 +125,7 @@ config PARPORT_GSC
        tristate
        default GSC
        depends on PARPORT
+       select PARPORT_NOT_PC
 
 config PARPORT_SUNBPP
        tristate "Sparc hardware (EXPERIMENTAL)"