diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/scsi/aha1740.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
| download | kernel_samsung_smdk4412-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip kernel_samsung_smdk4412-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.gz kernel_samsung_smdk4412-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.bz2 | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/aha1740.c')
| -rw-r--r-- | drivers/scsi/aha1740.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c index 6b35ed8..c3c38a7 100644 --- a/drivers/scsi/aha1740.c +++ b/drivers/scsi/aha1740.c @@ -223,8 +223,7 @@ static int aha1740_test_port(unsigned int base) } /* A "high" level interrupt handler */ -static irqreturn_t aha1740_intr_handle(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t aha1740_intr_handle(int irq, void *dev_id) { struct Scsi_Host *host = (struct Scsi_Host *) dev_id; void (*my_done)(Scsi_Cmnd *); |