On Wed, 1 May 2013, Fernando Luis Vázquez Cao wrote:
> 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.
>
> Cc: [email protected]
> Signed-off-by: Fernando Luis Vazquez Cao <[email protected]>
> ---
>
> diff -urNp linux-3.9/drivers/hid/hid-core.c
> linux-3.9-fix/drivers/hid/hid-core.c
> --- linux-3.9/drivers/hid/hid-core.c 2013-04-29 09:36:01.000000000 +0900
> +++ linux-3.9-fix/drivers/hid/hid-core.c 2013-04-30 21:53:57.596269692
> +0900
> @@ -1702,6 +1702,7 @@ static const struct hid_device_id hid_ha
> { HID_USB_DEVICE(USB_VENDOR_ID_SONY,
> USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY,
> USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
> { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE)
> },
> + { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE)
> },
> { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES,
> USB_DEVICE_ID_STEELSERIES_SRWS1) },
> { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP)
> },
> { HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },
Thanks a lot for noticing. Applied.
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
