diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-24 23:37:52 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-24 23:37:52 -0400 |
| commit | 308f0a5898033691d050374a949bbfe173987a16 (patch) | |
| tree | 9a7f2798e2f778d6ec126c2f9a1e2c0ba007c742 /drivers/macintosh | |
| parent | 0035a1dc8f56f2c92f4246b0c8b5f6d1ee10c76b (diff) | |
| parent | b345dc7da026016b65162b1ca7cfcd2c7212a285 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/mac_hid.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c index 89302309da9..f972ff377b6 100644 --- a/drivers/macintosh/mac_hid.c +++ b/drivers/macintosh/mac_hid.c @@ -103,6 +103,9 @@ int mac_hid_mouse_emulate_buttons(int caller, unsigned int keycode, int down) return 0; } +static struct lock_class_key emumousebtn_event_class; +static struct lock_class_key emumousebtn_mutex_class; + static int emumousebtn_input_register(void) { int ret; @@ -111,6 +114,9 @@ static int emumousebtn_input_register(void) if (!emumousebtn) return -ENOMEM; + lockdep_set_class(emumousebtn->event_lock, &emumousebtn_event_class); + lockdep_set_class(emumousebtn->mutex, &emumousebtn_mutex_class); + emumousebtn->name = "Macintosh mouse button emulation"; emumousebtn->id.bustype = BUS_ADB; emumousebtn->id.vendor = 0x0001; |