Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

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

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