Commit d1e34849 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Greg Kroah-Hartman
Browse files

usb storage: group dependent USB storage Kconfig entries together 



Instead of explicit setting of USB_STORAGE dependency for every
underlying build entries, exploit if USB_STORAGE / endif block.

The change is a trivial non-functional cleanup, it shortens
the Kconfig file and it is expected to reduce zconf parser
workload a little.

Dependencies of USB_UAS build option are left aside deliberately.

Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 71741bd6

drivers/usb/storage/Kconfig

+4 −14
Original line number Diff line number Diff line
@@ -23,16 +23,16 @@ config USB_STORAGE 
	  To compile this driver as a module, choose M here: the

	  module will be called usb-storage.



if USB_STORAGE



config USB_STORAGE_DEBUG

	bool "USB Mass Storage verbose debug"

	depends on USB_STORAGE

	help

	  Say Y here in order to have the USB Mass Storage code generate

	  verbose debugging messages.



config USB_STORAGE_REALTEK

	tristate "Realtek Card Reader support"

	depends on USB_STORAGE

	help

	  Say Y here to include additional code to support the power-saving function

	  for Realtek RTS51xx USB card readers.
@@ -46,7 +46,6 @@ config REALTEK_AUTOPM 


config USB_STORAGE_DATAFAB

	tristate "Datafab Compact Flash Reader support"

	depends on USB_STORAGE

	help

	  Support for certain Datafab CompactFlash readers.

	  Datafab has a web page at <http://www.datafab.com/>.
@@ -55,7 +54,6 @@ config USB_STORAGE_DATAFAB 


config USB_STORAGE_FREECOM

	tristate "Freecom USB/ATAPI Bridge support"

	depends on USB_STORAGE

	help

	  Support for the Freecom USB to IDE/ATAPI adaptor.

	  Freecom has a web page at <http://www.freecom.de/>.
@@ -64,7 +62,6 @@ config USB_STORAGE_FREECOM 


config USB_STORAGE_ISD200

	tristate "ISD-200 USB/ATA Bridge support"

	depends on USB_STORAGE

	---help---

	  Say Y here if you want to use USB Mass Store devices based

	  on the In-Systems Design ISD-200 USB/ATA bridge.
@@ -82,7 +79,6 @@ config USB_STORAGE_ISD200 


config USB_STORAGE_USBAT

	tristate "USBAT/USBAT02-based storage support"

	depends on USB_STORAGE

	help

	  Say Y here to include additional code to support storage devices

	  based on the SCM/Shuttle USBAT/USBAT02 processors.
@@ -105,7 +101,6 @@ config USB_STORAGE_USBAT 


config USB_STORAGE_SDDR09

	tristate "SanDisk SDDR-09 (and other SmartMedia, including DPCM) support"

	depends on USB_STORAGE

	help

	  Say Y here to include additional code to support the Sandisk SDDR-09

	  SmartMedia reader in the USB Mass Storage driver.
@@ -115,7 +110,6 @@ config USB_STORAGE_SDDR09 


config USB_STORAGE_SDDR55

	tristate "SanDisk SDDR-55 SmartMedia support"

	depends on USB_STORAGE

	help

	  Say Y here to include additional code to support the Sandisk SDDR-55

	  SmartMedia reader in the USB Mass Storage driver.
@@ -124,7 +118,6 @@ config USB_STORAGE_SDDR55 


config USB_STORAGE_JUMPSHOT

	tristate "Lexar Jumpshot Compact Flash Reader"

	depends on USB_STORAGE

	help

	  Say Y here to include additional code to support the Lexar Jumpshot

	  USB CompactFlash reader.
@@ -133,7 +126,6 @@ config USB_STORAGE_JUMPSHOT 


config USB_STORAGE_ALAUDA

	tristate "Olympus MAUSB-10/Fuji DPC-R1 support"

	depends on USB_STORAGE

	help

	  Say Y here to include additional code to support the Olympus MAUSB-10

	  and Fujifilm DPC-R1 USB Card reader/writer devices.
@@ -145,7 +137,6 @@ config USB_STORAGE_ALAUDA 


config USB_STORAGE_ONETOUCH

	tristate "Support OneTouch Button on Maxtor Hard Drives"

	depends on USB_STORAGE

	depends on INPUT=y || INPUT=USB_STORAGE

	help

	  Say Y here to include additional code to support the Maxtor OneTouch
@@ -160,7 +151,6 @@ config USB_STORAGE_ONETOUCH 


config USB_STORAGE_KARMA

	tristate "Support for Rio Karma music player"

	depends on USB_STORAGE

	help

	  Say Y here to include additional code to support the Rio Karma

	  USB interface.
@@ -174,7 +164,6 @@ config USB_STORAGE_KARMA 


config USB_STORAGE_CYPRESS_ATACB

	tristate "SAT emulation on Cypress USB/ATA Bridge with ATACB"

	depends on USB_STORAGE

	---help---

	  Say Y here if you want to use SAT (ata pass through) on devices based

	  on the Cypress USB/ATA bridge supporting ATACB. This will allow you
@@ -188,7 +177,6 @@ config USB_STORAGE_CYPRESS_ATACB 
config USB_STORAGE_ENE_UB6250

	tristate "USB ENE card reader support"

	depends on SCSI

	depends on USB_STORAGE

	---help---

	  Say Y here if you wish to control a ENE SD/MS Card reader.

	  Note that this driver does not support SM cards.
@@ -200,6 +188,8 @@ config USB_STORAGE_ENE_UB6250 
	  To compile this driver as a module, choose M here: the

	  module will be called ums-eneub6250.



endif # USB_STORAGE



config USB_UAS

	tristate "USB Attached SCSI"

	depends on SCSI && USB_STORAGE

CRA Git | Maintained and supported by SUSTech CRA and CCSE