Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / drivers / parport / Kconfig

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 16a2e6ae37f4b579bad45b50617d0ab62f524e4f..f605dea57224ca23e5f1159c670f554104de1c21 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
@@ -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.
@@ -121,6 +121,7 @@ config PARPORT_GSC
        tristate
        default GSC
        depends on PARPORT
+       select PARPORT_NOT_PC
 
 config PARPORT_SUNBPP
        tristate "Sparc hardware (EXPERIMENTAL)"