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/aacraid/sa.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/aacraid/sa.c')
| -rw-r--r-- | drivers/scsi/aacraid/sa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c index f906ead239dd..511b0a938fb1 100644 --- a/drivers/scsi/aacraid/sa.c +++ b/drivers/scsi/aacraid/sa.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | #include "aacraid.h" | 47 | #include "aacraid.h" |
| 48 | 48 | ||
| 49 | static irqreturn_t aac_sa_intr(int irq, void *dev_id, struct pt_regs *regs) | 49 | static irqreturn_t aac_sa_intr(int irq, void *dev_id) |
| 50 | { | 50 | { |
| 51 | struct aac_dev *dev = dev_id; | 51 | struct aac_dev *dev = dev_id; |
| 52 | unsigned short intstat, mask; | 52 | unsigned short intstat, mask; |