summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/mac_hid.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-02-13 06:57:21 +0100
committerKumar Gala <galak@kernel.crashing.org>2007-02-13 06:57:21 +0100
commit54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch)
tree40619a66ae6d8703a57bf681d087ffeabbffd346 /drivers/macintosh/mac_hid.c
parent[POWERPC] 85xx: Don't write reserved values to MAS1[TSIZE] (diff)
parent[POWERPC] spufs: Fix bitrot of the SPU mmap facility (diff)
downloadlinux-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.xz
linux-54c66f6d781e03dc0b23956234963c4911e6d1c0.zip
Merge branch 'master' into 85xx
Diffstat (limited to 'drivers/macintosh/mac_hid.c')
-rw-r--r--drivers/macintosh/mac_hid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c
index ee6b4ca69130..f632cec9ce45 100644
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -17,10 +17,10 @@
static struct input_dev *emumousebtn;
static int emumousebtn_input_register(void);
-static int mouse_emulate_buttons = 0;
+static int mouse_emulate_buttons;
static int mouse_button2_keycode = KEY_RIGHTCTRL; /* right control key */
static int mouse_button3_keycode = KEY_RIGHTALT; /* right option key */
-static int mouse_last_keycode = 0;
+static int mouse_last_keycode;
#if defined(CONFIG_SYSCTL)
/* file(s) in /proc/sys/dev/mac_hid */