vserver 1.9.3

[linux-2.6.git] / drivers / char / sonypi.c

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 28418d5..aa7c91d 100644 (file)
--- 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);
 }