X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Fsonypi.c;h=aa7c91d6f171c3cfc9c952a59e718e9c94f27832;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=28418d57fb10ccd92573fc195724d1602f4055a9;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 28418d57f..aa7c91d6f 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -50,12 +50,13 @@
 #include <asm/io.h>
 #include <asm/system.h>
 
+static int verbose; /* = 0 */
+
 #include "sonypi.h"
 #include <linux/sonypi.h>
 
 static struct sonypi_device sonypi_device;
 static int minor = -1;
-static int verbose; /* = 0 */
 static int fnkeyinit; /* = 0 */
 static int camera; /* = 0 */
 static int compat; /* = 0 */
@@ -66,7 +67,7 @@ static unsigned long mask = 0xffffffff;
 static inline void sonypi_initq(void) {
         sonypi_device.queue.head = sonypi_device.queue.tail = 0;
 	sonypi_device.queue.len = 0;
-	sonypi_device.queue.s_lock = (spinlock_t)SPIN_LOCK_UNLOCKED;
+	sonypi_device.queue.s_lock = SPIN_LOCK_UNLOCKED;
 	init_waitqueue_head(&sonypi_device.queue.proc_list);
 }