author | Dmitry Torokhov <dtor@insightbb.com> | |
Sat, 10 Feb 2007 06:26:32 +0000 (01:26 -0500) | ||
committer | Dmitry Torokhov <dtor@insightbb.com> | |
Sat, 10 Feb 2007 06:26:32 +0000 (01:26 -0500) |
1 | 2 | |||
---|---|---|---|---|
drivers/input/touchscreen/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/usb/input/hid-ff.c | patch | | diff1 | | diff2 | | blob | history |
drivers/usb/input/hid-lgff.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/input/touchscreen/Kconfig
Simple merge
diff --cc drivers/usb/input/hid-ff.c
index 0d644fa37c68014ba5f3e86c3e350a4906ed4860,5d145058a5cb33cf40a14873b0e363f4b5e23b00..bc7f8e6f8c97a12066b6ec7cf2294de0490ec442
{ 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */
{ 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */
{ 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */
+ { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */
#endif
+ #ifdef CONFIG_PANTHERLORD_FF
+ { 0x810, 0x0001, hid_plff_init },
+ #endif
#ifdef CONFIG_THRUSTMASTER_FF
{ 0x44f, 0xb304, hid_tmff_init },
#endif
diff --cc drivers/usb/input/hid-lgff.c
Simple merge