aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2017-02-22 17:08:02 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-14 08:00:19 -0400
commita46d03e3517990375bc4aafe7df969309245f068 (patch)
treee4f902c26c3c25f16f03cc0b8268c7ace28e038a
parent76aa65a2c0fd075c71a93ea93b67f101d187fce5 (diff)
scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m
commit 2559a1ef688f933835912c731bed2254146a9b04 upstream. The mac_scsi driver still gets disabled when SCSI=m. This should have been fixed back when I enabled the tristate but I didn't see the bug. Fixes: 6e9ae6d560e1 ("[PATCH] mac_scsi: Add module option to Kconfig") Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/scsi/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 3e2bdb90813c..17b1574920fd 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1497,7 +1497,7 @@ config ATARI_SCSI
1497 1497
1498config MAC_SCSI 1498config MAC_SCSI
1499 tristate "Macintosh NCR5380 SCSI" 1499 tristate "Macintosh NCR5380 SCSI"
1500 depends on MAC && SCSI=y 1500 depends on MAC && SCSI
1501 select SCSI_SPI_ATTRS 1501 select SCSI_SPI_ATTRS
1502 help 1502 help
1503 This is the NCR 5380 SCSI controller included on most of the 68030 1503 This is the NCR 5380 SCSI controller included on most of the 68030