Skip to content

Commit af8a672

Browse files
Johannes Thumshirnmartinkpetersen
authored andcommitted
scsi: remove NCR_Q720 driver
The NCR QUAD 720 SCSI driver depends on microchannel support, but microchannel support was removed from the kernel with commit bb8187d ("MCA: delete all remaining traces of microchannel bus support.") over 6 years ago. So zap the Q720 SCSI driver as well. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Hannes Reinecke <hare@suse.com> Acked-by: James E.J. Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 54e4571 commit af8a672

File tree

4 files changed

+4
-423
lines changed

4 files changed

+4
-423
lines changed

drivers/scsi/Kconfig

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -989,21 +989,9 @@ config SCSI_ZALON
989989
used on the add-in Bluefish, Barracuda & Shrike SCSI cards.
990990
Say Y here if you have one of these machines or cards.
991991

992-
config SCSI_NCR_Q720
993-
tristate "NCR Quad 720 MCA SCSI support"
994-
depends on MCA && SCSI
995-
select SCSI_SPI_ATTRS
996-
help
997-
This is a driver for the MicroChannel Quad 720 card produced by
998-
NCR and commonly used in 345x/35xx/4100 class machines. It always
999-
tries to negotiate sync and uses tag command queueing.
1000-
1001-
Unless you have an NCR manufactured machine, the chances are that
1002-
you do not have this SCSI card, so say N.
1003-
1004992
config SCSI_NCR53C8XX_DEFAULT_TAGS
1005993
int "default tagged command queue depth"
1006-
depends on SCSI_ZALON || SCSI_NCR_Q720
994+
depends on SCSI_ZALON
1007995
default "8"
1008996
---help---
1009997
"Tagged command queuing" is a feature of SCSI-2 which improves
@@ -1029,7 +1017,7 @@ config SCSI_NCR53C8XX_DEFAULT_TAGS
10291017

10301018
config SCSI_NCR53C8XX_MAX_TAGS
10311019
int "maximum number of queued commands"
1032-
depends on SCSI_ZALON || SCSI_NCR_Q720
1020+
depends on SCSI_ZALON
10331021
default "32"
10341022
---help---
10351023
This option allows you to specify the maximum number of commands
@@ -1046,7 +1034,7 @@ config SCSI_NCR53C8XX_MAX_TAGS
10461034

10471035
config SCSI_NCR53C8XX_SYNC
10481036
int "synchronous transfers frequency in MHz"
1049-
depends on SCSI_ZALON || SCSI_NCR_Q720
1037+
depends on SCSI_ZALON
10501038
default "20"
10511039
---help---
10521040
The SCSI Parallel Interface-2 Standard defines 5 classes of transfer
@@ -1080,7 +1068,7 @@ config SCSI_NCR53C8XX_SYNC
10801068

10811069
config SCSI_NCR53C8XX_NO_DISCONNECT
10821070
bool "not allow targets to disconnect"
1083-
depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0
1071+
depends on SCSI_ZALON && SCSI_NCR53C8XX_DEFAULT_TAGS=0
10841072
help
10851073
This option is only provided for safety if you suspect some SCSI
10861074
device of yours to not support properly the target-disconnect

drivers/scsi/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ obj-$(CONFIG_SCSI_PM8001) += pm8001/
7676
obj-$(CONFIG_SCSI_ISCI) += isci/
7777
obj-$(CONFIG_SCSI_IPS) += ips.o
7878
obj-$(CONFIG_SCSI_GENERIC_NCR5380) += g_NCR5380.o
79-
obj-$(CONFIG_SCSI_NCR_Q720) += NCR_Q720_mod.o
8079
obj-$(CONFIG_SCSI_QLOGIC_FAS) += qlogicfas408.o qlogicfas.o
8180
obj-$(CONFIG_PCMCIA_QLOGIC) += qlogicfas408.o
8281
obj-$(CONFIG_SCSI_QLOGIC_1280) += qla1280.o
@@ -179,7 +178,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
179178
-DCONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERS
180179
CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)
181180
zalon7xx-objs := zalon.o ncr53c8xx.o
182-
NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o
183181

184182
# Files generated that shall be removed upon make clean
185183
clean-files := 53c700_d.h 53c700_u.h scsi_devinfo_tbl.c

0 commit comments

Comments
 (0)