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/arm/eesox.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/arm/eesox.c')
| -rw-r--r-- | drivers/scsi/arm/eesox.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index dcbb4b2b3fe0..3f876fb75469 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c | |||
| @@ -138,10 +138,9 @@ eesoxscsi_terminator_ctl(struct Scsi_Host *host, int on_off) | |||
| 138 | * Purpose : handle interrupts from EESOX SCSI card | 138 | * Purpose : handle interrupts from EESOX SCSI card |
| 139 | * Params : irq - interrupt number | 139 | * Params : irq - interrupt number |
| 140 | * dev_id - user-defined (Scsi_Host structure) | 140 | * dev_id - user-defined (Scsi_Host structure) |
| 141 | * regs - processor registers at interrupt | ||
| 142 | */ | 141 | */ |
| 143 | static irqreturn_t | 142 | static irqreturn_t |
| 144 | eesoxscsi_intr(int irq, void *dev_id, struct pt_regs *regs) | 143 | eesoxscsi_intr(int irq, void *dev_id) |
| 145 | { | 144 | { |
| 146 | struct eesoxscsi_info *info = dev_id; | 145 | struct eesoxscsi_info *info = dev_id; |
| 147 | 146 | ||