Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / a100u2w.c

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 2684150917e690e033d9fc27d91087f09ba5bc6e..7f4241bfb9c437dcadf63f21913f803cccfdbae7 100644 (file)
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1013,7 +1013,7 @@ static void inia100SCBPost(BYTE * pHcb, BYTE * pScb)
 /*
  * Interrupt handler (main routine of the driver)
  */
-static irqreturn_t inia100_intr(int irqno, void *devid, struct pt_regs *regs)
+static irqreturn_t inia100_intr(int irqno, void *devid)
 {
        struct Scsi_Host *host = (struct Scsi_Host *)devid;
        ORC_HCS *pHcb = (ORC_HCS *)host->hostdata;
@@ -1067,7 +1067,7 @@ static int __devinit inia100_probe_one(struct pci_dev *pdev,
                goto out_disable_device;
        }
 
-       /* <02> read from base address + 0x50 offset to get the bios balue. */
+       /* <02> read from base address + 0x50 offset to get the bios value. */
        bios = ORC_RDWORD(port, 0x50);