diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-01-05 14:29:48 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-01-05 14:29:48 +0100 |
| commit | 9377a6e0dff05c90db0901d0296aba5262a28c67 (patch) | |
| tree | ee3ad3569c2ef8768c8206468385c08a98f421fb /drivers/hid/hid-core.c | |
| parent | d0dbfbe26b0c1ea28a144180a0b6ef5da0951274 (diff) | |
| parent | 08f9572671c8047e7234cbf150869aa3c3d59a97 (diff) | |
Merge branch 'for-4.10/upstream-fixes' into for-next
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index db87d918efca..3c8af87efbee 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2494,6 +2494,7 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0002) }, { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) }, { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) }, + { HID_USB_DEVICE(USB_VENDOR_ID_PETZL, USB_DEVICE_ID_PETZL_HEADLAMP) }, { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE) }, { HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) }, #if IS_ENABLED(CONFIG_MOUSE_SYNAPTICS_USB) |