summaryrefslogtreecommitdiffstats
path: root/drivers/usb/image
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-04-09 14:29:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-10 01:49:07 +0200
commit25e11ec4fe5271c4895265ecbb69531e6b0c0dd5 (patch)
treeff7baadd2effb7e76b62fce13b7392e4a59f8d03 /drivers/usb/image
parentUSB: option: add a D-Link DWM-156 variant (diff)
downloadlinux-25e11ec4fe5271c4895265ecbb69531e6b0c0dd5.tar.xz
linux-25e11ec4fe5271c4895265ecbb69531e6b0c0dd5.zip
USB: regroup all depends on USB within an if USB block
This patch removes the depends on USB from all config symbols in drivers/usb/host/Kconfig and replace that with an if USB / endif block as suggested by Alan Stern. Some source ... Kconfig lines have been shuffled around to permit a better regroupment of the Kconfig files depending on "config USB" item. No functionnal change is introduced. Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/image')
-rw-r--r--drivers/usb/image/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/image/Kconfig b/drivers/usb/image/Kconfig
index 33350f9dd34f..320d368c8dac 100644
--- a/drivers/usb/image/Kconfig
+++ b/drivers/usb/image/Kconfig
@@ -2,11 +2,9 @@
# USB Imaging devices configuration
#
comment "USB Imaging devices"
- depends on USB
config USB_MDC800
tristate "USB Mustek MDC800 Digital Camera support"
- depends on USB
---help---
Say Y here if you want to connect this type of still camera to
your computer's USB port. This driver can be used with gphoto 0.4.3
@@ -19,7 +17,7 @@ config USB_MDC800
config USB_MICROTEK
tristate "Microtek X6USB scanner support"
- depends on USB && SCSI
+ depends on SCSI
help
Say Y here if you want support for the Microtek X6USB and
possibly the Phantom 336CX, Phantom C6 and ScanMaker V6U(S)L.