From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Howells Subject: [PATCH 18/19] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #5] Date: Tue, 29 Aug 2006 17:46:28 +0100 Message-ID: <20060829164628.15723.14656.stgit@warthog.cambridge.redhat.com> References: <20060829164549.15723.15017.stgit@warthog.cambridge.redhat.com> Content-Type: text/plain; charset=utf-8; format=fixed Content-Transfer-Encoding: 8bit Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, dhowells@redhat.com Return-path: Received: from mx1.redhat.com ([66.187.233.31]:57501 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S965131AbWH2Qqg (ORCPT ); Tue, 29 Aug 2006 12:46:36 -0400 To: axboe@kernel.dk In-Reply-To: <20060829164549.15723.15017.stgit@warthog.cambridge.redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: David Howells 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: David Howells --- drivers/usb/storage/Kconfig | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index be9eec2..5f720d7 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig @@ -8,8 +8,7 @@ comment "may also be needed; see USB_STO 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.