diff options
| author | Jiri Kosina | 2016-07-28 10:49:23 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2016-07-28 10:49:23 +0200 |
| commit | 8c2f421c1f0fa7768767ecaad497aa676fc9015a (patch) | |
| tree | c4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf /drivers/usb/misc/Makefile | |
| parent | e82a82c19f4272ea5437cc76e5711b98e2ee6223 (diff) | |
| parent | f4c109b660fa1d0453a6dde75bef725304687832 (diff) | |
Merge branch 'for-4.8/hid-led' into for-linus
Conflicts:
drivers/hid/hid-thingm.c
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 2769cf6351b4..3d79faaad2fb 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile @@ -15,7 +15,6 @@ obj-$(CONFIG_USB_IOWARRIOR) += iowarrior.o obj-$(CONFIG_USB_ISIGHTFW) += isight_firmware.o obj-$(CONFIG_USB_LCD) += usblcd.o obj-$(CONFIG_USB_LD) += ldusb.o -obj-$(CONFIG_USB_LED) += usbled.o obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o obj-$(CONFIG_USB_RIO500) += rio500.o obj-$(CONFIG_USB_TEST) += usbtest.o |