Skip to content

L
linux-davinci
Commit 97849cf5 authored by Jiri Kosina's avatar Jiri Kosina
Browse files
Options

Merge branch 'upstream-fixes' into for-next

parents 6a732839 42960a13
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
drivers/hid/hid-core.c
View file @ 97849cf5
...@@ -1341,7 +1341,6 @@ static const struct hid_device_id hid_blacklist[] = { ...@@ -1341,7 +1341,6 @@ static const struct hid_device_id hid_blacklist[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) }, { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) }, { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
{ } { }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment