Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/block/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/block/paride/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -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

drivers/scsi/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -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