OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b0460b
)
fix adbhid mismerge
author
Al Viro
<viro@ftp.linux.org.uk>
Wed, 17 Oct 2007 00:02:46 +0000
(
01:02
+0100)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Wed, 17 Oct 2007 02:04:49 +0000
(19:04 -0700)
This fixes a lost 'key' variable declaration that went missing in a
mismerge (commit
b981d8b3f5e008ff10d993be633ad00564fc22cd
)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/macintosh/adbhid.c
patch
|
blob
|
history
diff --git
a/drivers/macintosh/adbhid.c
b/drivers/macintosh/adbhid.c
index
8cce016
..
2766e4f
100644
(file)
--- a/
drivers/macintosh/adbhid.c
+++ b/
drivers/macintosh/adbhid.c
@@
-282,7
+282,7
@@
static void
adbhid_input_keycode(int id, int scancode, int repeat)
{
struct adbhid *ahid = adbhid[id];
- int keycode, up_flag;
+ int keycode, up_flag
, key
;
keycode = scancode & 0x7f;
up_flag = scancode & 0x80;