2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 911ea1756e55..5e6620f8dabc 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -57,18 +57,6 @@ config AIC79XX_BUILD_FIRMWARE
        or modify the assembler Makefile or the files it includes if your
        build environment is different than that of the author.
-config AIC79XX_ENABLE_RD_STRM
-        bool "Enable Read Streaming for All Targets"
-        depends on SCSI_AIC79XX
-        default n
-        help
-        Read Streaming is a U320 protocol option that should enhance
-        performance.  Early U320 drive firmware actually performs slower
-        with read streaming enabled so it is disabled by default.  Read
-        Streaming can be configured in much the same way as tagged queueing
-        using the "rd_strm" command line option.  See
-        drivers/scsi/aic7xxx/README.aic79xx for details.
 config AIC79XX_DEBUG_ENABLE
        bool "Compile in Debugging Code"
        depends on SCSI_AIC79XX
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index cd93f9a8611f..88da670a7915 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -50,16 +50,6 @@ config AIC7XXX_RESET_DELAY_MS
        Default: 5000 (5 seconds)
-config AIC7XXX_PROBE_EISA_VL
-        bool "Probe for EISA and VL AIC7XXX Adapters"
-        depends on SCSI_AIC7XXX && EISA
-        help
-        Probe for EISA and VLB Aic7xxx controllers.  In many newer systems,
-        the invasive probes necessary to detect these controllers can cause
-        other devices to fail.  For this reason, the non-PCI probe code is
-        disabled by default.  The current value of this option can be "toggled"
-        via the no_probe kernel command line option.
 config AIC7XXX_BUILD_FIRMWARE
        bool "Build Adapter Firmware with Kernel Build"
        depends on SCSI_AIC7XXX && !PREVENT_FIRMWARE_BUILD

diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx index 911ea1756e55..5e6620f8dabc 100644 --- a/drivers/scsi/aic7xxx/Kconfig.aic79xx +++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -57,18 +57,6 @@ config AIC79XX_BUILD_FIRMWARE
57	or modify the assembler Makefile or the files it includes if your	57	or modify the assembler Makefile or the files it includes if your
58	build environment is different than that of the author.	58	build environment is different than that of the author.
59		59
60	config AIC79XX_ENABLE_RD_STRM
61	bool "Enable Read Streaming for All Targets"
62	depends on SCSI_AIC79XX
63	default n
64	help
65	Read Streaming is a U320 protocol option that should enhance
66	performance. Early U320 drive firmware actually performs slower
67	with read streaming enabled so it is disabled by default. Read
68	Streaming can be configured in much the same way as tagged queueing
69	using the "rd_strm" command line option. See
70	drivers/scsi/aic7xxx/README.aic79xx for details.
71
72	config AIC79XX_DEBUG_ENABLE	60	config AIC79XX_DEBUG_ENABLE
73	bool "Compile in Debugging Code"	61	bool "Compile in Debugging Code"
74	depends on SCSI_AIC79XX	62	depends on SCSI_AIC79XX


diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx index cd93f9a8611f..88da670a7915 100644 --- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx +++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -50,16 +50,6 @@ config AIC7XXX_RESET_DELAY_MS
50		50
51	Default: 5000 (5 seconds)	51	Default: 5000 (5 seconds)
52		52
53	config AIC7XXX_PROBE_EISA_VL
54	bool "Probe for EISA and VL AIC7XXX Adapters"
55	depends on SCSI_AIC7XXX && EISA
56	help
57	Probe for EISA and VLB Aic7xxx controllers. In many newer systems,
58	the invasive probes necessary to detect these controllers can cause
59	other devices to fail. For this reason, the non-PCI probe code is
60	disabled by default. The current value of this option can be "toggled"
61	via the no_probe kernel command line option.
62
63	config AIC7XXX_BUILD_FIRMWARE	53	config AIC7XXX_BUILD_FIRMWARE
64	bool "Build Adapter Firmware with Kernel Build"	54	bool "Build Adapter Firmware with Kernel Build"
65	depends on SCSI_AIC7XXX && !PREVENT_FIRMWARE_BUILD	55	depends on SCSI_AIC7XXX && !PREVENT_FIRMWARE_BUILD