sun3_scsi: Adopt atari_NCR5380 core driver and remove sun3_NCR5380.c

Given the preceding changes to atari_NCR5380.c, this patch should not change
behaviour of the sun3_scsi and sun3_scsi_vme modules.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index 84d9c5d..d206f37 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6304,7 +6304,6 @@ F:        drivers/scsi/g_NCR5380.*
 F:     drivers/scsi/g_NCR5380_mmio.c
 F:     drivers/scsi/mac_scsi.*
 F:     drivers/scsi/pas16.*
-F:     drivers/scsi/sun3_NCR5380.c
 F:     drivers/scsi/sun3_scsi.*
 F:     drivers/scsi/sun3_scsi_vme.c
 F:     drivers/scsi/t128.*

diff --cc drivers/scsi/sun3_NCR5380.c
Simple merge

diff --cc drivers/scsi/sun3_scsi.c
Simple merge