Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input subsystem updates from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: psmouse - cleanup Focaltech code
Input: i8042 - add XMG C504 to keyboard reset table

+10 -3
+3 -3
drivers/input/mouse/focaltech.c
··· 43 43 44 44 if (set_properties) { 45 45 psmouse->vendor = "FocalTech"; 46 - psmouse->name = "FocalTech Touchpad"; 46 + psmouse->name = "Touchpad"; 47 47 } 48 48 49 49 return 0; ··· 146 146 } 147 147 input_mt_report_pointer_emulation(dev, true); 148 148 149 - input_report_key(psmouse->dev, BTN_LEFT, state->pressed); 150 - input_sync(psmouse->dev); 149 + input_report_key(dev, BTN_LEFT, state->pressed); 150 + input_sync(dev); 151 151 } 152 152 153 153 static void focaltech_process_touch_packet(struct psmouse *psmouse,
+7
drivers/input/serio/i8042-x86ia64io.h
··· 877 877 DMI_MATCH(DMI_PRODUCT_NAME, "P34"), 878 878 }, 879 879 }, 880 + { 881 + /* Schenker XMG C504 - Elantech touchpad */ 882 + .matches = { 883 + DMI_MATCH(DMI_SYS_VENDOR, "XMG"), 884 + DMI_MATCH(DMI_PRODUCT_NAME, "C504"), 885 + }, 886 + }, 880 887 { } 881 888 }; 882 889