tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Vladimir Zapolskiy and committed by
Greg Kroah-Hartman d1e34849 71741bd6

+4 -14
+4 -14
drivers/usb/storage/Kconfig
··· 23 23 To compile this driver as a module, choose M here: the 24 24 module will be called usb-storage. 25 25 26 + if USB_STORAGE 27 + 26 28 config USB_STORAGE_DEBUG 27 29 bool "USB Mass Storage verbose debug" 28 - depends on USB_STORAGE 29 30 help 30 31 Say Y here in order to have the USB Mass Storage code generate 31 32 verbose debugging messages. 32 33 33 34 config USB_STORAGE_REALTEK 34 35 tristate "Realtek Card Reader support" 35 - depends on USB_STORAGE 36 36 help 37 37 Say Y here to include additional code to support the power-saving function 38 38 for Realtek RTS51xx USB card readers. ··· 46 46 47 47 config USB_STORAGE_DATAFAB 48 48 tristate "Datafab Compact Flash Reader support" 49 - depends on USB_STORAGE 50 49 help 51 50 Support for certain Datafab CompactFlash readers. 52 51 Datafab has a web page at <http://www.datafab.com/>. ··· 54 55 55 56 config USB_STORAGE_FREECOM 56 57 tristate "Freecom USB/ATAPI Bridge support" 57 - depends on USB_STORAGE 58 58 help 59 59 Support for the Freecom USB to IDE/ATAPI adaptor. 60 60 Freecom has a web page at <http://www.freecom.de/>. ··· 62 64 63 65 config USB_STORAGE_ISD200 64 66 tristate "ISD-200 USB/ATA Bridge support" 65 - depends on USB_STORAGE 66 67 ---help--- 67 68 Say Y here if you want to use USB Mass Store devices based 68 69 on the In-Systems Design ISD-200 USB/ATA bridge. ··· 79 82 80 83 config USB_STORAGE_USBAT 81 84 tristate "USBAT/USBAT02-based storage support" 82 - depends on USB_STORAGE 83 85 help 84 86 Say Y here to include additional code to support storage devices 85 87 based on the SCM/Shuttle USBAT/USBAT02 processors. ··· 101 105 102 106 config USB_STORAGE_SDDR09 103 107 tristate "SanDisk SDDR-09 (and other SmartMedia, including DPCM) support" 104 - depends on USB_STORAGE 105 108 help 106 109 Say Y here to include additional code to support the Sandisk SDDR-09 107 110 SmartMedia reader in the USB Mass Storage driver. ··· 110 115 111 116 config USB_STORAGE_SDDR55 112 117 tristate "SanDisk SDDR-55 SmartMedia support" 113 - depends on USB_STORAGE 114 118 help 115 119 Say Y here to include additional code to support the Sandisk SDDR-55 116 120 SmartMedia reader in the USB Mass Storage driver. ··· 118 124 119 125 config USB_STORAGE_JUMPSHOT 120 126 tristate "Lexar Jumpshot Compact Flash Reader" 121 - depends on USB_STORAGE 122 127 help 123 128 Say Y here to include additional code to support the Lexar Jumpshot 124 129 USB CompactFlash reader. ··· 126 133 127 134 config USB_STORAGE_ALAUDA 128 135 tristate "Olympus MAUSB-10/Fuji DPC-R1 support" 129 - depends on USB_STORAGE 130 136 help 131 137 Say Y here to include additional code to support the Olympus MAUSB-10 132 138 and Fujifilm DPC-R1 USB Card reader/writer devices. ··· 137 145 138 146 config USB_STORAGE_ONETOUCH 139 147 tristate "Support OneTouch Button on Maxtor Hard Drives" 140 - depends on USB_STORAGE 141 148 depends on INPUT=y || INPUT=USB_STORAGE 142 149 help 143 150 Say Y here to include additional code to support the Maxtor OneTouch ··· 151 160 152 161 config USB_STORAGE_KARMA 153 162 tristate "Support for Rio Karma music player" 154 - depends on USB_STORAGE 155 163 help 156 164 Say Y here to include additional code to support the Rio Karma 157 165 USB interface. ··· 164 174 165 175 config USB_STORAGE_CYPRESS_ATACB 166 176 tristate "SAT emulation on Cypress USB/ATA Bridge with ATACB" 167 - depends on USB_STORAGE 168 177 ---help--- 169 178 Say Y here if you want to use SAT (ata pass through) on devices based 170 179 on the Cypress USB/ATA bridge supporting ATACB. This will allow you ··· 177 188 config USB_STORAGE_ENE_UB6250 178 189 tristate "USB ENE card reader support" 179 190 depends on SCSI 180 - depends on USB_STORAGE 181 191 ---help--- 182 192 Say Y here if you wish to control a ENE SD/MS Card reader. 183 193 Note that this driver does not support SM cards. ··· 187 199 188 200 To compile this driver as a module, choose M here: the 189 201 module will be called ums-eneub6250. 202 + 203 + endif # USB_STORAGE 190 204 191 205 config USB_UAS 192 206 tristate "USB Attached SCSI"