[SCSI] qla2xxx: Add support for fabric name FC transport attribute.

[pandora-kernel.git] / drivers / scsi / oktagon_esp.c

diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c
index 573d7ef..dd67a68 100644 (file)
--- a/drivers/scsi/oktagon_esp.c
+++ b/drivers/scsi/oktagon_esp.c
@@ -6,7 +6,6 @@
  * Based on cyber_esp.c
  */
 
-#include <linux/config.h>
 
 #if defined(CONFIG_AMIGA) || defined(CONFIG_APUS)
 #define USE_BOTTOM_HALF
@@ -114,7 +113,7 @@ static volatile unsigned char cmd_buffer[16];
                                 */
 
 /***************************************************************** Detection */
-int oktagon_esp_detect(Scsi_Host_Template *tpnt)
+int oktagon_esp_detect(struct scsi_host_template *tpnt)
 {
        struct NCR_ESP *esp;
        struct zorro_dev *z = NULL;
@@ -198,7 +197,7 @@ int oktagon_esp_detect(Scsi_Host_Template *tpnt)
                esp->esp_command_dvma = (__u32) cmd_buffer;
 
                esp->irq = IRQ_AMIGA_PORTS;
-               request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,
+               request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,
                            "BSC Oktagon SCSI", esp->ehost);
 
                /* Figure out our scsi ID on the bus */
@@ -490,7 +489,7 @@ static void dma_led_on(struct NCR_ESP *esp)
 
 static int dma_ports_p(struct NCR_ESP *esp)
 {
-       return ((custom.intenar) & IF_PORTS);
+       return ((amiga_custom.intenar) & IF_PORTS);
 }
 
 static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
@@ -585,7 +584,7 @@ int oktagon_esp_release(struct Scsi_Host *instance)
 }
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
        .proc_name              = "esp-oktagon",
        .proc_info              = &esp_proc_info,
        .name                   = "BSC Oktagon SCSI",