Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / scsi / arm / cumana_1.c

diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index aa75d50..e6c9491 100644 (file)
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -13,11 +13,10 @@
 
 #include <asm/ecard.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/system.h>
 
 #include "../scsi.h"
-#include "../hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsicam.h>
 
@@ -238,15 +237,13 @@ static void cumanascsi_write(struct Scsi_Host *instance, int reg, int value)
 
 #include "../NCR5380.c"
 
-static Scsi_Host_Template cumanascsi_template = {
+static struct scsi_host_template cumanascsi_template = {
        .module                 = THIS_MODULE,
        .name                   = "Cumana 16-bit SCSI",
        .info                   = cumanascsi_info,
        .queuecommand           = cumanascsi_queue_command,
        .eh_abort_handler       = NCR5380_abort,
-       .eh_device_reset_handler= NCR5380_device_reset,
        .eh_bus_reset_handler   = NCR5380_bus_reset,
-       .eh_host_reset_handler  = NCR5380_host_reset,
        .can_queue              = 16,
        .this_id                = 7,
        .sg_tablesize           = SG_ALL,
@@ -321,6 +318,7 @@ static void __devexit cumanascsi1_remove(struct expansion_card *ec)
 
        scsi_remove_host(host);
        free_irq(host->irq, host);
+       NCR5380_exit(host);
        release_region(host->io_port, host->n_io_port);
        scsi_host_put(host);
 }