rename thread_info to stack

[powerpc.git] / drivers / scsi / fastlane.c

diff --git a/drivers/scsi/fastlane.c b/drivers/scsi/fastlane.c
index 8ae9c40..4266a21 100644 (file)
--- a/drivers/scsi/fastlane.c
+++ b/drivers/scsi/fastlane.c
@@ -142,7 +142,7 @@ int __init fastlane_esp_detect(struct scsi_host_template *tpnt)
                if (board < 0x1000000) {
                        goto err_release;
                }
-               esp = esp_allocate(tpnt, (void *)board+FASTLANE_ESP_ADDR);
+               esp = esp_allocate(tpnt, (void *)board + FASTLANE_ESP_ADDR, 0);
 
                /* Do command transfer with programmed I/O */
                esp->do_pio_cmds = 1;
@@ -210,7 +210,7 @@ int __init fastlane_esp_detect(struct scsi_host_template *tpnt)
 
                esp->irq = IRQ_AMIGA_PORTS;
                esp->slot = board+FASTLANE_ESP_ADDR;
-               if (request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,
+               if (request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,
                                "Fastlane SCSI", esp->ehost)) {
                        printk(KERN_WARNING "Fastlane: Could not get IRQ%d, aborting.\n", IRQ_AMIGA_PORTS);
                        goto err_unmap;