From a8b5a4b9e3565e2f584a731ffaeedfb42eca7ed4 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@mindspring.com>
Date: Sat, 10 Feb 2007 01:46:28 -0800
Subject: [PATCH] --- yaml --- r: 47615 b: refs/heads/master c:
 482a579b370a0bf924b577efd6c750284a95e0fb h: refs/heads/master i:   47613:
 a965860a9de3b8b5ad35828b36e8dccf628f4899   47611:
 d467d4733103d7aa82a3c8f5a1c71e8986f0ab20   47607:
 10057d632cfffc429572b20b440cace77544f761   47599:
 6f28ae7a229548614f96dd8840f32e2e5ffaf680   47583:
 09e5e632b9b27571f1de86663c623d99cdee9d2b   47551:
 53949988fb2770e25d15e8962e5aa8709a3181e5   47487:
 167bc3405500b9507579bd1e1c9638e5da06183b   47359:
 1e304705422fd4589f9a50513a11edf108307cba   47103:
 4cb26064cdaad23649f9f03e150725ea07137faf v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/block/paride/Kconfig | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 14eaf29ea9b5..38cd9e42ad46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 730c385bc58802b51812bfcd13ae3578d16c1dfd
+refs/heads/master: 482a579b370a0bf924b577efd6c750284a95e0fb
diff --git a/trunk/drivers/block/paride/Kconfig b/trunk/drivers/block/paride/Kconfig
index c0d2854dd097..28cf3082d442 100644
--- a/trunk/drivers/block/paride/Kconfig
+++ b/trunk/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