Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6] / drivers / scsi / arm / Kconfig

diff --git a/drivers/scsi/arm/Kconfig b/drivers/scsi/arm/Kconfig
index d006a8cb4a7451fd439b97f6cd725efd3f5db001..7236143941f340cf1aba493079274369ac95bb5e 100644 (file)
--- a/drivers/scsi/arm/Kconfig
+++ b/drivers/scsi/arm/Kconfig
@@ -74,15 +74,6 @@ config SCSI_CUMANA_1
          This enables support for the Cumana SCSI I card. If you have an
          Acorn system with one of these, say Y. If unsure, say N.
 
-config SCSI_ECOSCSI
-       tristate "EcoScsi support (EXPERIMENTAL)"
-       depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI
-       select SCSI_SPI_ATTRS
-       help
-         This enables support for the EcoSCSI card -- a small card that sits
-         in the Econet socket. If you have an Acorn system with one of these,
-         say Y. If unsure, say N.
-
 config SCSI_OAK1
        tristate "Oak SCSI support (EXPERIMENTAL)"
        depends on ARCH_ACORN && EXPERIMENTAL && SCSI