]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/4.9.28/scsi-mac_scsi-fix-mac_scsi-m-option-when-scsi-m.patch
Remove duplicated commits
[thirdparty/kernel/stable-queue.git] / releases / 4.9.28 / scsi-mac_scsi-fix-mac_scsi-m-option-when-scsi-m.patch
1 From 2559a1ef688f933835912c731bed2254146a9b04 Mon Sep 17 00:00:00 2001
2 From: Finn Thain <fthain@telegraphics.com.au>
3 Date: Thu, 23 Feb 2017 09:08:02 +1100
4 Subject: scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m
5
6 From: Finn Thain <fthain@telegraphics.com.au>
7
8 commit 2559a1ef688f933835912c731bed2254146a9b04 upstream.
9
10 The mac_scsi driver still gets disabled when SCSI=m. This should have
11 been fixed back when I enabled the tristate but I didn't see the bug.
12
13 Fixes: 6e9ae6d560e1 ("[PATCH] mac_scsi: Add module option to Kconfig")
14 Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
15 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
17
18 ---
19 drivers/scsi/Kconfig | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22 --- a/drivers/scsi/Kconfig
23 +++ b/drivers/scsi/Kconfig
24 @@ -1497,7 +1497,7 @@ config ATARI_SCSI
25
26 config MAC_SCSI
27 tristate "Macintosh NCR5380 SCSI"
28 - depends on MAC && SCSI=y
29 + depends on MAC && SCSI
30 select SCSI_SPI_ATTRS
31 help
32 This is the NCR 5380 SCSI controller included on most of the 68030