[SCSI] lpfc: fix oops when parsing dodgy VPD

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

diff --git a/drivers/scsi/atari_dma_emul.c b/drivers/scsi/atari_dma_emul.c
index 7026045..cdc710e 100644 (file)
--- a/drivers/scsi/atari_dma_emul.c
+++ b/drivers/scsi/atari_dma_emul.c
@@ -19,6 +19,8 @@
  * this code.
  */
 
+#include <linux/compiler.h>
+#include <asm/thread_info.h>
 #include <asm/uaccess.h>
 
 #define hades_dma_ctrl         (*(unsigned char *) 0xffff8717)
@@ -108,7 +110,7 @@ static inline void set_restdata_reg(unsigned char *cur_addr)
 }
 
 /*
- * void hades_dma_emulator(int irq, void *dummy, struct pt_regs *fp)
+ * void hades_dma_emulator(int irq, void *dummy)
  * 
  * This code emulates TT SCSI DMA on the Hades.
  * 
@@ -138,7 +140,7 @@ static inline void set_restdata_reg(unsigned char *cur_addr)
  *    increased with one.
  */
 
-static irqreturn_t hades_dma_emulator(int irq, void *dummy, struct pt_regs *fp)
+static irqreturn_t hades_dma_emulator(int irq, void *dummy)
 {
        unsigned long dma_base;
        register unsigned long dma_cnt asm ("d3");