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 /sound/pci/au88x0/au88x0.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 'sound/pci/au88x0/au88x0.h')
| -rw-r--r-- | sound/pci/au88x0/au88x0.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h index b1cfc3c79d07..5ccf0b1ec670 100644 --- a/sound/pci/au88x0/au88x0.h +++ b/sound/pci/au88x0/au88x0.h | |||
| @@ -236,8 +236,7 @@ static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode); | |||
| 236 | static int vortex_core_init(vortex_t * card); | 236 | static int vortex_core_init(vortex_t * card); |
| 237 | static int vortex_core_shutdown(vortex_t * card); | 237 | static int vortex_core_shutdown(vortex_t * card); |
| 238 | static void vortex_enable_int(vortex_t * card); | 238 | static void vortex_enable_int(vortex_t * card); |
| 239 | static irqreturn_t vortex_interrupt(int irq, void *dev_id, | 239 | static irqreturn_t vortex_interrupt(int irq, void *dev_id); |
| 240 | struct pt_regs *regs); | ||
| 241 | static int vortex_alsafmt_aspfmt(int alsafmt); | 240 | static int vortex_alsafmt_aspfmt(int alsafmt); |
| 242 | 241 | ||
| 243 | /* Connection stuff. */ | 242 | /* Connection stuff. */ |