diff options
author | Marko Kohtala <marko.kohtala@gmail.com> | 2006-01-06 03:19:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:57 -0500 |
commit | 6a19b41b35bf45fc27a46dccf26005b3f44c1aa1 (patch) | |
tree | d041d74fd511d1eba667492c060b61edc6f7b1cd /drivers/block | |
parent | 110bee75d2e03d3b4bcc74743dee5a21fe7b43bd (diff) |
[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>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/Kconfig | 2 | ||||
-rw-r--r-- | drivers/block/paride/Kconfig | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index c4b9d2adfc08..139cbba76180 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig | |||
@@ -117,7 +117,7 @@ config BLK_DEV_XD | |||
117 | 117 | ||
118 | config PARIDE | 118 | config PARIDE |
119 | tristate "Parallel port IDE device support" | 119 | tristate "Parallel port IDE device support" |
120 | depends on PARPORT | 120 | depends on PARPORT_PC |
121 | ---help--- | 121 | ---help--- |
122 | There are many external CD-ROM and disk devices that connect through | 122 | There are many external CD-ROM and disk devices that connect through |
123 | your computer's parallel port. Most of them are actually IDE devices | 123 | 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 17ff40561257..c0d2854dd097 100644 --- a/drivers/block/paride/Kconfig +++ b/drivers/block/paride/Kconfig | |||
@@ -4,11 +4,12 @@ | |||
4 | # PARIDE doesn't need PARPORT, but if PARPORT is configured as a module, | 4 | # PARIDE doesn't need PARPORT, but if PARPORT is configured as a module, |
5 | # PARIDE must also be a module. The bogus CONFIG_PARIDE_PARPORT option | 5 | # PARIDE must also be a module. The bogus CONFIG_PARIDE_PARPORT option |
6 | # controls the choices given to the user ... | 6 | # controls the choices given to the user ... |
7 | # PARIDE only supports PC style parports. Tough for USB or other parports... | ||
7 | config PARIDE_PARPORT | 8 | config PARIDE_PARPORT |
8 | tristate | 9 | tristate |
9 | depends on PARIDE!=n | 10 | depends on PARIDE!=n |
10 | default m if PARPORT=m | 11 | default m if PARPORT_PC=m |
11 | default y if PARPORT!=m | 12 | default y if PARPORT_PC!=m |
12 | 13 | ||
13 | comment "Parallel IDE high-level drivers" | 14 | comment "Parallel IDE high-level drivers" |
14 | depends on PARIDE | 15 | depends on PARIDE |