diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-16 20:02:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 22:04:49 -0400 |
| commit | 68f3e6622bb60c6b477971b56d1913077834fdcd (patch) | |
| tree | 748598aa546b88c05e7a67ed723934e51b910cad | |
| parent | 2b0460b534f383eca744eb8fff66ec9f57e702b9 (diff) | |
fix adbhid mismerge
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>
| -rw-r--r-- | drivers/macintosh/adbhid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 8cce016b3d09..2766e4fc4ea8 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
| @@ -282,7 +282,7 @@ static void | |||
| 282 | adbhid_input_keycode(int id, int scancode, int repeat) | 282 | adbhid_input_keycode(int id, int scancode, int repeat) |
| 283 | { | 283 | { |
| 284 | struct adbhid *ahid = adbhid[id]; | 284 | struct adbhid *ahid = adbhid[id]; |
| 285 | int keycode, up_flag; | 285 | int keycode, up_flag, key; |
| 286 | 286 | ||
| 287 | keycode = scancode & 0x7f; | 287 | keycode = scancode & 0x7f; |
| 288 | up_flag = scancode & 0x80; | 288 | up_flag = scancode & 0x80; |