diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 10:49:23 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 10:49:23 +0200 |
| commit | 8c2f421c1f0fa7768767ecaad497aa676fc9015a (patch) | |
| tree | c4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf /drivers/usb/misc/Kconfig | |
| parent | e82a82c19f4272ea5437cc76e5711b98e2ee6223 (diff) | |
| parent | f4c109b660fa1d0453a6dde75bef725304687832 (diff) | |
| download | linux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.tar.gz linux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.tar.bz2 linux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.zip | |
Merge branch 'for-4.8/hid-led' into for-linus
Conflicts:
drivers/hid/hid-thingm.c
Diffstat (limited to 'drivers/usb/misc/Kconfig')
| -rw-r--r-- | drivers/usb/misc/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index e9e5ae521fa6..9e5c835deeb2 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig @@ -79,15 +79,6 @@ config USB_LCD To compile this driver as a module, choose M here: the module will be called usblcd. -config USB_LED - tristate "USB LED driver support" - help - Say Y here if you want to connect an USBLED device to your - computer's USB port. - - To compile this driver as a module, choose M here: the - module will be called usbled. - config USB_CYPRESS_CY7C63 tristate "Cypress CY7C63xxx USB driver support" help |