diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-14 07:36:49 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-14 07:36:49 +0200 |
commit | 97856e59384de326174360a780038113fea19f42 (patch) | |
tree | 6b4d9e5fb0e93e0274a7d2626276e5d475824568 /drivers/usb/misc/Kconfig | |
parent | misc: Use the correct style for SPDX License Identifier (diff) | |
parent | Linux 5.4-rc3 (diff) | |
download | linux-97856e59384de326174360a780038113fea19f42.tar.xz linux-97856e59384de326174360a780038113fea19f42.zip |
Merge 5.4-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc/Kconfig')
-rw-r--r-- | drivers/usb/misc/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index bdae62b2ffe0..9bce583aada3 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig @@ -47,16 +47,6 @@ config USB_SEVSEG To compile this driver as a module, choose M here: the module will be called usbsevseg. -config USB_RIO500 - tristate "USB Diamond Rio500 support" - help - Say Y here if you want to connect a USB Rio500 mp3 player to your - computer's USB port. Please read <file:Documentation/usb/rio.rst> - for more information. - - To compile this driver as a module, choose M here: the - module will be called rio500. - config USB_LEGOTOWER tristate "USB Lego Infrared Tower support" help |