3 files changed, 0 insertions, 176 deletions

diff --git a/drivers/scsi/arm/Kconfig b/drivers/scsi/arm/Kconfig
index d006a8cb4a74..7236143941f3 100644
--- 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
diff --git a/drivers/scsi/arm/Makefile b/drivers/scsi/arm/Makefile
index e8db17924c1d..16c3e86a6b1b 100644
--- a/drivers/scsi/arm/Makefile
+++ b/drivers/scsi/arm/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_SCSI_ACORNSCSI_3)	+= acornscsi_mod.o queue.o msgqueue.o
 obj-$(CONFIG_SCSI_ARXESCSI)     += arxescsi.o fas216.o queue.o msgqueue.o
 obj-$(CONFIG_SCSI_CUMANA_1)     += cumana_1.o
 obj-$(CONFIG_SCSI_CUMANA_2)     += cumana_2.o fas216.o queue.o msgqueue.o
-obj-$(CONFIG_SCSI_ECOSCSI)      += ecoscsi.o
 obj-$(CONFIG_SCSI_OAK1)         += oak.o
 obj-$(CONFIG_SCSI_POWERTECSCSI) += powertec.o fas216.o queue.o msgqueue.o
 obj-$(CONFIG_SCSI_EESOXSCSI)    += eesox.o fas216.o queue.o msgqueue.o
diff --git a/drivers/scsi/arm/ecoscsi.c b/drivers/scsi/arm/ecoscsi.c
deleted file mode 100644
index 5265a9884338..000000000000
--- a/drivers/scsi/arm/ecoscsi.c
+++ /dev/null
@@ -1,166 +0,0 @@
-#define AUTOSENSE
-/* #define PSEUDO_DMA */
-
-/*
- * EcoSCSI Generic NCR5380 driver
- *
- * Copyright 1995, Russell King
- *
- * ALPHA RELEASE 1.
- *
- * For more information, please consult
- *
- * NCR 5380 Family
- * SCSI Protocol Controller
- * Databook
- *
- * NCR Microelectronics
- * 1635 Aeroplaza Drive
- * Colorado Springs, CO 80916
- * 1+ (719) 578-3400
- * 1+ (800) 334-5454
- */
-
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/blkdev.h>
-
-#include <asm/io.h>
-#include <asm/system.h>
-
-#include "../scsi.h"
-#include <scsi/scsi_host.h>
-
-#define priv(host)                      ((struct NCR5380_hostdata *)(host)->hostdata)
-
-#define NCR5380_local_declare()         void __iomem *_base
-#define NCR5380_setup(host)             _base = priv(host)->base
-
-#define NCR5380_read(reg)               ({ writeb(reg | 8, _base); readb(_base + 4); })
-#define NCR5380_write(reg, value)       ({ writeb(reg | 8, _base); writeb(value, _base + 4); })
-
-#define NCR5380_intr                    ecoscsi_intr
-#define NCR5380_queue_command           ecoscsi_queue_command
-#define NCR5380_proc_info               ecoscsi_proc_info
-
-#define NCR5380_implementation_fields   \
-        void __iomem *base
-
-#include "../NCR5380.h"
-
-#define ECOSCSI_PUBLIC_RELEASE 1
-
-/*
- * Function : ecoscsi_setup(char *str, int *ints)
- *
- * Purpose : LILO command line initialization of the overrides array,
- *
- * Inputs : str - unused, ints - array of integer parameters with ints[0]
- *      equal to the number of ints.
- *
- */
-
-void ecoscsi_setup(char *str, int *ints)
-{
-}
-
-const char * ecoscsi_info (struct Scsi_Host *spnt)
-{
-        return "";
-}
-
-#define BOARD_NORMAL    0
-#define BOARD_NCR53C400 1
-
-#include "../NCR5380.c"
-
-static struct scsi_host_template ecoscsi_template =  {
-        .module         = THIS_MODULE,
-        .name           = "Serial Port EcoSCSI NCR5380",
-        .proc_name      = "ecoscsi",
-        .info           = ecoscsi_info,
-        .queuecommand   = ecoscsi_queue_command,
-        .eh_abort_handler       = NCR5380_abort,
-        .eh_bus_reset_handler   = NCR5380_bus_reset,
-        .can_queue      = 16,
-        .this_id        = 7,
-        .sg_tablesize   = SG_ALL,
-        .cmd_per_lun    = 2,
-        .use_clustering = DISABLE_CLUSTERING
-};
-
-static struct Scsi_Host *host;
-
-static int __init ecoscsi_init(void)
-{
-        void __iomem *_base;
-        int ret;
-
-        if (!request_mem_region(0x33a0000, 4096, "ecoscsi")) {
-                ret = -EBUSY;
-                goto out;
-        }
-
-        _base = ioremap(0x33a0000, 4096);
-        if (!_base) {
-                ret = -ENOMEM;
-                goto out_release;
-        }
-
-        NCR5380_write(MODE_REG, 0x20);          /* Is it really SCSI? */
-        if (NCR5380_read(MODE_REG) != 0x20)     /* Write to a reg.    */
-                goto out_unmap;
-
-        NCR5380_write(MODE_REG, 0x00);          /* it back.           */
-        if (NCR5380_read(MODE_REG) != 0x00)
-                goto out_unmap;
-
-        host = scsi_host_alloc(tpnt, sizeof(struct NCR5380_hostdata));
-        if (!host) {
-                ret = -ENOMEM;
-                goto out_unmap;
-        }
-
-        priv(host)->base = _base;
-        host->irq = IRQ_NONE;
-
-        NCR5380_init(host, 0);
-
-        printk("scsi%d: at port 0x%08lx irqs disabled", host->host_no, host->io_port);
-        printk(" options CAN_QUEUE=%d CMD_PER_LUN=%d release=%d",
-                host->can_queue, host->cmd_per_lun, ECOSCSI_PUBLIC_RELEASE);
-        printk("\nscsi%d:", host->host_no);
-        NCR5380_print_options(host);
-        printk("\n");
-
-        scsi_add_host(host, NULL); /* XXX handle failure */
-        scsi_scan_host(host);
-        return 0;
-
- out_unmap:
-        iounmap(_base);
- out_release:
-        release_mem_region(0x33a0000, 4096);
- out:
-        return ret;
-}
-
-static void __exit ecoscsi_exit(void)
-{
-        scsi_remove_host(host);
-        NCR5380_exit(host);
-        scsi_host_put(host);
-        release_mem_region(0x33a0000, 4096);
-        return 0;
-}
-
-module_init(ecoscsi_init);
-module_exit(ecoscsi_exit);
-
-MODULE_AUTHOR("Russell King");
-MODULE_DESCRIPTION("Econet-SCSI driver for Acorn machines");
-MODULE_LICENSE("GPL");
-