Re: [PATCH] isd200: limit to BLK_DEV_IDE

Linus Torvalds
2006-03-30T23:04:57Z

On Thu, 30 Mar 2006, Randy.Dunlap wrote:
>
> Limit USB_STORAGE_ISD200 to whatever BLK_DEV_IDE and USB_STORAGE
> are set to (y, m) since isd200 calls ide_fix_driveid() in the
> BLK_DEV_IDE code.
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> ---
> drivers/usb/storage/Kconfig | 2 +-
> 1 files changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-2616-z.orig/drivers/usb/storage/Kconfig
> +++ linux-2616-z/drivers/usb/storage/Kconfig
> @@ -48,7 +48,7 @@ config USB_STORAGE_FREECOM
>
> config USB_STORAGE_ISD200
> bool "ISD-200 USB/ATA Bridge support"
> - depends on USB_STORAGE && BLK_DEV_IDE
> + depends on USB_STORAGE && (BLK_DEV_IDE=y || BLK_DEV_IDE=m && USB_STORAGE=m)

Hmm. That expression is _really_ hard to figure out.

It would be more logical to make it

depends on USB_STORAGE && (BLK_DEV_IDE=y || BLK_DEV_IDE=USB_STORAGE)

or, even more preferably, split up the rules as two separate dependencies:

depends on USB_STORAGE
depends on BLK_DEV_IDE=y || BLK_DEV_IDE=USB_STORAGE

(where that second thing really _should_ be expressible as

depends on BLK_DEV_IDE >= USB_STORAGE

but the kconfig language doesn't support that syntax..)

Linus