[PATCH] remove many unneeded #includes of sched.h

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

diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index 27271bf..cf9a21c 100644 (file)
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -5,7 +5,6 @@
  */
 #include <linux/module.h>
 #include <linux/signal.h>
-#include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/blkdev.h>
@@ -13,7 +12,6 @@
 
 #include <asm/ecard.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/system.h>
 
 #include "../scsi.h"
@@ -238,15 +236,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,
@@ -280,7 +276,7 @@ cumanascsi1_probe(struct expansion_card *ec, const struct ecard_id *id)
         ((struct NCR5380_hostdata *)host->hostdata)->ctrl = 0;
         outb(0x00, host->io_port - 577);
 
-       ret = request_irq(host->irq, cumanascsi_intr, SA_INTERRUPT,
+       ret = request_irq(host->irq, cumanascsi_intr, IRQF_DISABLED,
                          "CumanaSCSI-1", host);
        if (ret) {
                printk("scsi%d: IRQ%d not free: %d\n",