diff options
author | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
commit | 09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch) | |
tree | 29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /drivers/scsi/Kconfig | |
parent | d0d59b98d7a0b3801ce03e695ba885b698a6d122 (diff) | |
parent | 9c2c38a122cc23d6a09b8004d60a33913683eedf (diff) |
Merge HEAD from ../from-linus
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r-- | drivers/scsi/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index f1e8c4223ed..12c208fb18c 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -1696,7 +1696,7 @@ config TT_DMA_EMUL config MAC_SCSI bool "Macintosh NCR5380 SCSI" - depends on MAC && SCSI + depends on MAC && SCSI=y help This is the NCR 5380 SCSI controller included on most of the 68030 based Macintoshes. If you have one of these say Y and read the @@ -1717,7 +1717,7 @@ config SCSI_MAC_ESP config MVME147_SCSI bool "WD33C93 SCSI driver for MVME147" - depends on MVME147 && SCSI + depends on MVME147 && SCSI=y help Support for the on-board SCSI controller on the Motorola MVME147 single-board computer. @@ -1758,7 +1758,7 @@ config SUN3_SCSI config SUN3X_ESP bool "Sun3x ESP SCSI" - depends on SUN3X && SCSI + depends on SUN3X && SCSI=y help The ESP was an on-board SCSI controller used on Sun 3/80 machines. Say Y here to compile in support for it. |