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

[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
...@@ -8,8 +8,7 @@ comment "may also be needed; see USB_STORAGE Help for more information" ...@@ -8,8 +8,7 @@ comment "may also be needed; see USB_STORAGE Help for more information"
config USB_STORAGE config USB_STORAGE
tristate "USB Mass Storage support" tristate "USB Mass Storage support"
depends on USB depends on USB && SCSI
select SCSI
---help--- ---help---
Say Y here if you want to connect USB mass storage devices to your 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 computer's USB port. This is the driver you need for USB
...@@ -18,7 +17,7 @@ config USB_STORAGE ...@@ -18,7 +17,7 @@ config USB_STORAGE
similar devices. This driver may also be used for some cameras similar devices. This driver may also be used for some cameras
and card readers. 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' probably also need 'SCSI device support: SCSI disk support'
(BLK_DEV_SD) for most USB storage devices. (BLK_DEV_SD) for most USB storage devices.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment