fix adbhid mismerge

[safe/jmp/linux-2.6] / drivers / macintosh / adbhid.c

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;