Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65934a9a authored by David Howells's avatar David Howells Committed by Jens Axboe
Browse files

[PATCH] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #6] 



This makes CONFIG_USB_STORAGE depend on CONFIG_SCSI rather than selecting it,
as selecting it makes CONFIG_USB_STORAGE override the dependencies of SCSI,
causing it to turn on even if they aren't all met.

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9361401e

drivers/usb/storage/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ comment "may also be needed; see USB_STORAGE Help for more information" 


config USB_STORAGE

	tristate "USB Mass Storage support"

	depends on USB

	select SCSI

	depends on USB && SCSI

	---help---

	  Say Y here if you want to connect USB mass storage devices to your

	  computer's USB port. This is the driver you need for USB
@@ -18,7 +17,7 @@ config USB_STORAGE 
	  similar devices. This driver may also be used for some cameras

	  and card readers.



	  This option 'selects' (turns on, enables) 'SCSI', but you

	  This option depends on 'SCSI' support being enabled, but you

	  probably also need 'SCSI device support: SCSI disk support'

	  (BLK_DEV_SD) for most USB storage devices.