diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-11-08 14:10:38 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-11-08 14:10:38 +0100 |
| commit | 6b240aeb121ec14a528a58413baa9a74f8749604 (patch) | |
| tree | 4148d2f8aa56b75488fbd568048ac81fa786ae9a /drivers/hid/hid-google-hammer.c | |
| parent | Revert "gpio: merrifield: Pass irqchip when adding gpiochip" (diff) | |
| parent | Revert "gpio: expose pull-up/pull-down line flags to userspace" (diff) | |
| download | linux-6b240aeb121ec14a528a58413baa9a74f8749604.tar.xz linux-6b240aeb121ec14a528a58413baa9a74f8749604.zip | |
Merge branch 'devel' into for-next
Diffstat (limited to 'drivers/hid/hid-google-hammer.c')
| -rw-r--r-- | drivers/hid/hid-google-hammer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c index 84f8c127ebdc..d86a9189e88f 100644 --- a/drivers/hid/hid-google-hammer.c +++ b/drivers/hid/hid-google-hammer.c @@ -470,6 +470,10 @@ static const struct hid_device_id hammer_devices[] = { { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_HAMMER) }, { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, + USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_MAGNEMITE) }, + { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, + USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_MASTERBALL) }, + { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_STAFF) }, { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_WAND) }, |