Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / drivers / block / paride / Kconfig

diff --git a/drivers/block/paride/Kconfig b/drivers/block/paride/Kconfig
index c0d2854..28cf308 100644 (file)
--- a/drivers/block/paride/Kconfig
+++ b/drivers/block/paride/Kconfig
@@ -2,14 +2,8 @@
 # PARIDE configuration
 #
 # 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 must also be a module.
 # PARIDE only supports PC style parports. Tough for USB or other parports...
-config PARIDE_PARPORT
-       tristate
-       depends on PARIDE!=n
-       default m if PARPORT_PC=m
-       default y if PARPORT_PC!=m
 
 comment "Parallel IDE high-level drivers"
        depends on PARIDE