diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/scsi/arm/powertec.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/arm/powertec.c')
| -rw-r--r-- | drivers/scsi/arm/powertec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index b2c346a47052..ce159c15bc86 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c | |||
| @@ -112,10 +112,8 @@ powertecscsi_terminator_ctl(struct Scsi_Host *host, int on_off) | |||
| 112 | * Purpose : handle interrupts from Powertec SCSI card | 112 | * Purpose : handle interrupts from Powertec SCSI card |
| 113 | * Params : irq - interrupt number | 113 | * Params : irq - interrupt number |
| 114 | * dev_id - user-defined (Scsi_Host structure) | 114 | * dev_id - user-defined (Scsi_Host structure) |
| 115 | * regs - processor registers at interrupt | ||
| 116 | */ | 115 | */ |
| 117 | static irqreturn_t | 116 | static irqreturn_t powertecscsi_intr(int irq, void *dev_id) |
| 118 | powertecscsi_intr(int irq, void *dev_id, struct pt_regs *regs) | ||
| 119 | { | 117 | { |
| 120 | struct powertec_info *info = dev_id; | 118 | struct powertec_info *info = dev_id; |
| 121 | 119 | ||