[PATCH] parport: Kconfig dependency fixes

Make drivers that use directly PC parport HW depend on PARPORT_PC rather than
HW independent PARPORT.

Signed-off-by: Marko Kohtala <marko.kohtala@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index c4b9d2adfc08bce861a9078945c4e0acf63628a4..139cbba76180bcba6076c40bc30fce7c7d1deb41 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -117,7 +117,7 @@ config BLK_DEV_XD
 
 config PARIDE
        tristate "Parallel port IDE device support"
-       depends on PARPORT
+       depends on PARPORT_PC
        ---help---
          There are many external CD-ROM and disk devices that connect through
          your computer's parallel port. Most of them are actually IDE devices

diff --git a/drivers/block/paride/Kconfig b/drivers/block/paride/Kconfig
index 17ff4056125719b7ffb7bed21e1e32cd8f2bd86a..c0d2854dd097e8b9bb4673d14923d5eb778d1391 100644 (file)
--- a/drivers/block/paride/Kconfig
+++ b/drivers/block/paride/Kconfig
@@ -4,11 +4,12 @@
 # PARIDE doesn't need PARPORT, but if PARPORT is configured as a module,
 # PARIDE must also be a module.  The bogus CONFIG_PARIDE_PARPORT option
 # controls the choices given to the user ...
+# PARIDE only supports PC style parports. Tough for USB or other parports...
 config PARIDE_PARPORT
        tristate
        depends on PARIDE!=n
-       default m if PARPORT=m
-       default y if PARPORT!=m
+       default m if PARPORT_PC=m
+       default y if PARPORT_PC!=m
 
 comment "Parallel IDE high-level drivers"
        depends on PARIDE

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 9e8254f0256c1ffdb651be19ae49f72a0ad91190..3c606cf8c8cabc7518e44ce44a3e5ec877359a3a 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -914,7 +914,7 @@ config SCSI_INIA100
 
 config SCSI_PPA
        tristate "IOMEGA parallel port (ppa - older drives)"
-       depends on SCSI && PARPORT
+       depends on SCSI && PARPORT_PC
        ---help---
          This driver supports older versions of IOMEGA's parallel port ZIP
          drive (a 100 MB removable media device).
@@ -941,7 +941,7 @@ config SCSI_PPA
 
 config SCSI_IMM
        tristate "IOMEGA parallel port (imm - newer drives)"
-       depends on SCSI && PARPORT
+       depends on SCSI && PARPORT_PC
        ---help---
          This driver supports newer versions of IOMEGA's parallel port ZIP
          drive (a 100 MB removable media device).
@@ -968,7 +968,7 @@ config SCSI_IMM
 
 config SCSI_IZIP_EPP16
        bool "ppa/imm option - Use slow (but safe) EPP-16"
-       depends on PARPORT && (SCSI_PPA || SCSI_IMM)
+       depends on SCSI_PPA || SCSI_IMM
        ---help---
          EPP (Enhanced Parallel Port) is a standard for parallel ports which
          allows them to act as expansion buses that can handle up to 64
@@ -983,7 +983,7 @@ config SCSI_IZIP_EPP16
 
 config SCSI_IZIP_SLOW_CTR
        bool "ppa/imm option - Assume slow parport control register"
-       depends on PARPORT && (SCSI_PPA || SCSI_IMM)
+       depends on SCSI_PPA || SCSI_IMM
        help
          Some parallel ports are known to have excessive delays between
          changing the parallel port control register and good data being