]> www.infradead.org Git - users/dwmw2/linux.git/commit
HID: reintroduce fix-up for certain Sony RF receivers
authorFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Wed, 1 May 2013 00:26:23 +0000 (09:26 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 19 May 2013 18:38:10 +0000 (11:38 -0700)
commit6defe2bdc863d4ddc5ea5737f2dc09881f76d7f6
tree9ce4c31cf40bf3cd3ae40b547b4957d9aae37531
parentc2b4972016dcc9d883ce5333d97d9454d9ae24e1
HID: reintroduce fix-up for certain Sony RF receivers

commit c1e0ac192b48b37f31801c17534ab3d2a9282d84 upstream.

It looks like the manual merge 0d69a3c731e120b05b7da9fb976830475a3fbc01 ("Merge
branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus") accidentally
removed Sony RF receiver with USB product id 0x0374 from the "have special
driver" list, effectively nullifying a464918419f94a0043d2f549d6defb4c3f69f68a
("HID: add support for Sony RF receiver with USB product id 0x0374"). Add the
device back to the list.

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hid/hid-core.c