diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2019-11-29 20:34:28 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-11-29 20:34:28 +0100 |
| commit | b746a1a2860f4a918f32d10dc569115d282aaf2f (patch) | |
| tree | 4b30e6ff28e2783c73a1b763e819f5b41414563c /drivers/usb/misc/Makefile | |
| parent | HID: rmi: Check that the RMI_STARTED bit is set before unregistering the RMI transport device (diff) | |
| parent | HID: quirks: remove hid-led devices from hid_have_special_driver (diff) | |
| download | linux-dev-b746a1a2860f4a918f32d10dc569115d282aaf2f.tar.xz linux-dev-b746a1a2860f4a918f32d10dc569115d282aaf2f.zip | |
Merge branch 'for-5.5/core' into for-linus
- hid_have_special_driver[] cleanup for LED devices (Heiner Kallweit)
- HID parser improvements (Blaž Hrastnik, Candle Sun)
Diffstat (limited to 'drivers/usb/misc/Makefile')
| -rw-r--r-- | drivers/usb/misc/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index 109f54f5b9aa..0d416eb624bb 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile @@ -17,7 +17,6 @@ obj-$(CONFIG_USB_ISIGHTFW) += isight_firmware.o obj-$(CONFIG_USB_LCD) += usblcd.o obj-$(CONFIG_USB_LD) += ldusb.o obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o -obj-$(CONFIG_USB_RIO500) += rio500.o obj-$(CONFIG_USB_TEST) += usbtest.o obj-$(CONFIG_USB_EHSET_TEST_FIXTURE) += ehset.o obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o |