Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c
index 9f9401c..4b258f7 100644 (file)
--- a/drivers/block/paride/paride.c
+++ b/drivers/block/paride/paride.c
@@ -21,7 +21,6 @@
 #define PI_VERSION      "1.06"
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/kmod.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -29,6 +28,7 @@
 #include <linux/string.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
+#include <linux/sched.h>       /* TASK_* */
 
 #ifdef CONFIG_PARPORT_MODULE
 #define CONFIG_PARPORT
@@ -46,7 +46,7 @@ MODULE_LICENSE("GPL");
 
 static struct pi_protocol *protocols[MAX_PROTOS];
 
-static spinlock_t pi_spinlock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pi_spinlock);
 
 void pi_write_regr(PIA * pi, int cont, int regr, int val)
 {
@@ -140,7 +140,7 @@ static void pi_claim(PIA * pi)
 #endif
 }
 
-void pi_unclaim(PIA * pi)
+static void pi_unclaim(PIA * pi)
 {
        pi->claimed = 0;
 #ifdef CONFIG_PARPORT
@@ -149,8 +149,6 @@ void pi_unclaim(PIA * pi)
 #endif
 }
 
-EXPORT_SYMBOL(pi_unclaim);
-
 void pi_connect(PIA * pi)
 {
        pi_claim(pi);