Commit 6a19b41b authored by Marko Kohtala's avatar Marko Kohtala Committed by Linus Torvalds

[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: default avatarMarko Kohtala <marko.kohtala@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 110bee75
...@@ -117,7 +117,7 @@ config BLK_DEV_XD ...@@ -117,7 +117,7 @@ config BLK_DEV_XD
config PARIDE config PARIDE
tristate "Parallel port IDE device support" tristate "Parallel port IDE device support"
depends on PARPORT depends on PARPORT_PC
---help--- ---help---
There are many external CD-ROM and disk devices that connect through There are many external CD-ROM and disk devices that connect through
your computer's parallel port. Most of them are actually IDE devices your computer's parallel port. Most of them are actually IDE devices
......
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
# PARIDE doesn't need PARPORT, but if PARPORT is configured as a module, # 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 # PARIDE must also be a module. The bogus CONFIG_PARIDE_PARPORT option
# controls the choices given to the user ... # controls the choices given to the user ...
# PARIDE only supports PC style parports. Tough for USB or other parports...
config PARIDE_PARPORT config PARIDE_PARPORT
tristate tristate
depends on PARIDE!=n depends on PARIDE!=n
default m if PARPORT=m default m if PARPORT_PC=m
default y if PARPORT!=m default y if PARPORT_PC!=m
comment "Parallel IDE high-level drivers" comment "Parallel IDE high-level drivers"
depends on PARIDE depends on PARIDE
......
...@@ -914,7 +914,7 @@ config SCSI_INIA100 ...@@ -914,7 +914,7 @@ config SCSI_INIA100
config SCSI_PPA config SCSI_PPA
tristate "IOMEGA parallel port (ppa - older drives)" tristate "IOMEGA parallel port (ppa - older drives)"
depends on SCSI && PARPORT depends on SCSI && PARPORT_PC
---help--- ---help---
This driver supports older versions of IOMEGA's parallel port ZIP This driver supports older versions of IOMEGA's parallel port ZIP
drive (a 100 MB removable media device). drive (a 100 MB removable media device).
...@@ -941,7 +941,7 @@ config SCSI_PPA ...@@ -941,7 +941,7 @@ config SCSI_PPA
config SCSI_IMM config SCSI_IMM
tristate "IOMEGA parallel port (imm - newer drives)" tristate "IOMEGA parallel port (imm - newer drives)"
depends on SCSI && PARPORT depends on SCSI && PARPORT_PC
---help--- ---help---
This driver supports newer versions of IOMEGA's parallel port ZIP This driver supports newer versions of IOMEGA's parallel port ZIP
drive (a 100 MB removable media device). drive (a 100 MB removable media device).
...@@ -968,7 +968,7 @@ config SCSI_IMM ...@@ -968,7 +968,7 @@ config SCSI_IMM
config SCSI_IZIP_EPP16 config SCSI_IZIP_EPP16
bool "ppa/imm option - Use slow (but safe) EPP-16" bool "ppa/imm option - Use slow (but safe) EPP-16"
depends on PARPORT && (SCSI_PPA || SCSI_IMM) depends on SCSI_PPA || SCSI_IMM
---help--- ---help---
EPP (Enhanced Parallel Port) is a standard for parallel ports which EPP (Enhanced Parallel Port) is a standard for parallel ports which
allows them to act as expansion buses that can handle up to 64 allows them to act as expansion buses that can handle up to 64
...@@ -983,7 +983,7 @@ config SCSI_IZIP_EPP16 ...@@ -983,7 +983,7 @@ config SCSI_IZIP_EPP16
config SCSI_IZIP_SLOW_CTR config SCSI_IZIP_SLOW_CTR
bool "ppa/imm option - Assume slow parport control register" bool "ppa/imm option - Assume slow parport control register"
depends on PARPORT && (SCSI_PPA || SCSI_IMM) depends on SCSI_PPA || SCSI_IMM
help help
Some parallel ports are known to have excessive delays between Some parallel ports are known to have excessive delays between
changing the parallel port control register and good data being changing the parallel port control register and good data being
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment