diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/scsi/aic7xxx/aic7xxx_osm.h | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm.h')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h index d42a71ee076d..a87a4ce090df 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h | |||
| @@ -830,7 +830,7 @@ int ahc_platform_abort_scbs(struct ahc_softc *ahc, int target, | |||
| 830 | char channel, int lun, u_int tag, | 830 | char channel, int lun, u_int tag, |
| 831 | role_t role, uint32_t status); | 831 | role_t role, uint32_t status); |
| 832 | irqreturn_t | 832 | irqreturn_t |
| 833 | ahc_linux_isr(int irq, void *dev_id, struct pt_regs * regs); | 833 | ahc_linux_isr(int irq, void *dev_id); |
| 834 | void ahc_platform_flushwork(struct ahc_softc *ahc); | 834 | void ahc_platform_flushwork(struct ahc_softc *ahc); |
| 835 | void ahc_done(struct ahc_softc*, struct scb*); | 835 | void ahc_done(struct ahc_softc*, struct scb*); |
| 836 | void ahc_send_async(struct ahc_softc *, char channel, | 836 | void ahc_send_async(struct ahc_softc *, char channel, |