瀏覽代碼

[PATCH] M68k: Mark Sun-3 NCR5380 SCSI broken

M68k: Mark Sun-3 NCR5380 SCSI broken until NCR5380_abort() and
NCR5380_bus_reset() are replaced with real new-style EH routines (the old EH
SCSI constants were removed in 2.6.12-rc3).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Geert Uytterhoeven 20 年之前
父節點
當前提交
c3315ede1b
共有 2 個文件被更改,包括 1 次插入2 次删除
  1. 0 1
      arch/m68k/configs/sun3_defconfig
  2. 1 1
      drivers/scsi/Kconfig

+ 0 - 1
arch/m68k/configs/sun3_defconfig

@@ -173,7 +173,6 @@ CONFIG_SCSI_CONSTANTS=y
 #
 #
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DEBUG is not set
-CONFIG_SUN3_SCSI=y
 
 
 #
 #
 # Multi-device support (RAID and LVM)
 # Multi-device support (RAID and LVM)

+ 1 - 1
drivers/scsi/Kconfig

@@ -1752,7 +1752,7 @@ config SCSI_NCR53C7xx_FAST
 
 
 config SUN3_SCSI
 config SUN3_SCSI
 	tristate "Sun3 NCR5380 SCSI"
 	tristate "Sun3 NCR5380 SCSI"
-	depends on SUN3 && SCSI
+	depends on SUN3 && SCSI && BROKEN
 	help
 	help
 	  This option will enable support for the OBIO (onboard io) NCR5380
 	  This option will enable support for the OBIO (onboard io) NCR5380
 	  SCSI controller found in the Sun 3/50 and 3/60, as well as for
 	  SCSI controller found in the Sun 3/50 and 3/60, as well as for