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/aic94xx/aic94xx_hwi.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_hwi.h')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_hwi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.h b/drivers/scsi/aic94xx/aic94xx_hwi.h index 8498144aa5e1..14319d1d6804 100644 --- a/drivers/scsi/aic94xx/aic94xx_hwi.h +++ b/drivers/scsi/aic94xx/aic94xx_hwi.h | |||
| @@ -371,7 +371,7 @@ static inline void asd_ascb_free_list(struct asd_ascb *ascb_list) | |||
| 371 | /* ---------- Function declarations ---------- */ | 371 | /* ---------- Function declarations ---------- */ |
| 372 | 372 | ||
| 373 | int asd_init_hw(struct asd_ha_struct *asd_ha); | 373 | int asd_init_hw(struct asd_ha_struct *asd_ha); |
| 374 | irqreturn_t asd_hw_isr(int irq, void *dev_id, struct pt_regs *regs); | 374 | irqreturn_t asd_hw_isr(int irq, void *dev_id); |
| 375 | 375 | ||
| 376 | 376 | ||
| 377 | struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct | 377 | struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct |