mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits) Input: wacom - add support for Cintiq 20WSX Input: ucb1400_ts - IRQ probe fix Input: at32psif - update MODULE_AUTHOR with new email Input: mac_hid - add lockdep annotation to emumousebtn Input: i8042 - fix incorrect usage of strncpy and strncat Input: bf54x-keys - add infrastructure for keypad wakeups Input: add MODULE_ALIAS() to hotpluggable platform modules Input: drivers/char/keyboard.c - use time_after Input: fix ordering in joystick Makefile Input: wm97xx-core - support use as a wakeup source Input: wm97xx-core - use IRQF_SAMPLE_RANDOM Input: wm97xx-core - only schedule interrupt handler if not already scheduled Input: add Zhen Hua driver Input: aiptek - add support for Genius G-PEN 560 tablet Input: wacom - implement suspend and autosuspend Input: xpad - set proper buffer length for outgoing requests Input: omap-keypad - fix build warning Input: gpio_keys - irq handling cleanup Input: add PS/2 serio driver for AVR32 devices Input: put ledstate in the keyboard notifier ...
This commit is contained in:
commit
ce1d5b23a8
49 changed files with 3904 additions and 119 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue