Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / block / paride / Kconfig

diff --git a/drivers/block/paride/Kconfig b/drivers/block/paride/Kconfig
index 4eebf91..c0d2854 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 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
 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
 
 comment "Parallel IDE high-level drivers"
        depends on PARIDE


@@ -119,7 +120,7 @@ config PARIDE_BPCK
          before 1999 were Series 5) Series 5 drives will NOT always have the
          Series noted on the bottom of the drive. Series 6 drivers will.
 
          before 1999 were Series 5) Series 5 drives will NOT always have the
          Series noted on the bottom of the drive. Series 6 drivers will.
 

-         In other words, if your BACKPACK drive dosen't say "Series 6" on the
+         In other words, if your BACKPACK drive doesn't say "Series 6" on the

          bottom, enable this option.
 
          If you chose to build PARIDE support into your kernel, you may
          bottom, enable this option.
 
          If you chose to build PARIDE support into your kernel, you may