git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
char
/
ec3104_keyb.c
diff --git
a/drivers/char/ec3104_keyb.c
b/drivers/char/ec3104_keyb.c
index
b3289d9
..
4aed669
100644
(file)
--- a/
drivers/char/ec3104_keyb.c
+++ b/
drivers/char/ec3104_keyb.c
@@
-43,9
+43,9
@@
#include <linux/slab.h>
#include <linux/kbd_kern.h>
#include <linux/smp_lock.h>
#include <linux/slab.h>
#include <linux/kbd_kern.h>
#include <linux/smp_lock.h>
+#include <linux/bitops.h>
#include <asm/keyboard.h>
#include <asm/keyboard.h>
-#include <asm/bitops.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
#include <asm/system.h>
@@
-92,7
+92,7
@@
static void aux_write_ack(int val);
static void __aux_write_ack(int val);
#endif
static void __aux_write_ack(int val);
#endif
-static
spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(kbd_controller_lock)
;
static unsigned char handle_kbd_event(void);
/* used only by send_data - set by keyboard_interrupt */
static unsigned char handle_kbd_event(void);
/* used only by send_data - set by keyboard_interrupt */