tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Marko Kohtala and committed by
Linus Torvalds 6a19b41b 110bee75

+8 -7
+1 -1
drivers/block/Kconfig
··· 117 117 118 118 config PARIDE 119 119 tristate "Parallel port IDE device support" 120 - depends on PARPORT 120 + depends on PARPORT_PC 121 121 ---help--- 122 122 There are many external CD-ROM and disk devices that connect through 123 123 your computer's parallel port. Most of them are actually IDE devices
+3 -2
drivers/block/paride/Kconfig
··· 4 4 # PARIDE doesn't need PARPORT, but if PARPORT is configured as a module, 5 5 # PARIDE must also be a module. The bogus CONFIG_PARIDE_PARPORT option 6 6 # controls the choices given to the user ... 7 + # PARIDE only supports PC style parports. Tough for USB or other parports... 7 8 config PARIDE_PARPORT 8 9 tristate 9 10 depends on PARIDE!=n 10 - default m if PARPORT=m 11 - default y if PARPORT!=m 11 + default m if PARPORT_PC=m 12 + default y if PARPORT_PC!=m 12 13 13 14 comment "Parallel IDE high-level drivers" 14 15 depends on PARIDE
+4 -4
drivers/scsi/Kconfig
··· 914 914 915 915 config SCSI_PPA 916 916 tristate "IOMEGA parallel port (ppa - older drives)" 917 - depends on SCSI && PARPORT 917 + depends on SCSI && PARPORT_PC 918 918 ---help--- 919 919 This driver supports older versions of IOMEGA's parallel port ZIP 920 920 drive (a 100 MB removable media device). ··· 941 941 942 942 config SCSI_IMM 943 943 tristate "IOMEGA parallel port (imm - newer drives)" 944 - depends on SCSI && PARPORT 944 + depends on SCSI && PARPORT_PC 945 945 ---help--- 946 946 This driver supports newer versions of IOMEGA's parallel port ZIP 947 947 drive (a 100 MB removable media device). ··· 968 968 969 969 config SCSI_IZIP_EPP16 970 970 bool "ppa/imm option - Use slow (but safe) EPP-16" 971 - depends on PARPORT && (SCSI_PPA || SCSI_IMM) 971 + depends on SCSI_PPA || SCSI_IMM 972 972 ---help--- 973 973 EPP (Enhanced Parallel Port) is a standard for parallel ports which 974 974 allows them to act as expansion buses that can handle up to 64 ··· 983 983 984 984 config SCSI_IZIP_SLOW_CTR 985 985 bool "ppa/imm option - Assume slow parport control register" 986 - depends on PARPORT && (SCSI_PPA || SCSI_IMM) 986 + depends on SCSI_PPA || SCSI_IMM 987 987 help 988 988 Some parallel ports are known to have excessive delays between 989 989 changing the parallel port control register and good data being