Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=68f3e6622bb60c6b477971b56d1913077834fdcd
Commit: 68f3e6622bb60c6b477971b56d1913077834fdcd
Parent: 2b0460b534f383eca744eb8fff66ec9f57e702b9
Author: Al Viro <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 01:02:46 2007 +0100
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 19:04:49 2007 -0700
fix adbhid mismerge
This fixes a lost 'key' variable declaration that went missing in a
mismerge (commit b981d8b3f5e008ff10d993be633ad00564fc22cd)
Signed-off-by: Al Viro <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
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 8cce016..2766e4f 100644
--- 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
