From: Dmitry Torokhov <dtor@insightbb.com>
Date: Sat, 10 Feb 2007 06:26:32 +0000 (-0500)
Subject: Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.21-rc1~274^2~228^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b22364c8eec89e6b0c081a237f3b6348df87796f

Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
---

b22364c8eec89e6b0c081a237f3b6348df87796f
diff --cc drivers/usb/input/hid-ff.c
index 0d644fa37c68,5d145058a5cb..bc7f8e6f8c97
--- a/drivers/usb/input/hid-ff.c
+++ b/drivers/usb/input/hid-ff.c
@@@ -56,8 -57,10 +57,11 @@@ static struct hid_ff_initializer inits[
  	{ 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