diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 23:32:01 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 23:32:01 (GMT) |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /sound/oss/mpu401.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
| download | linux-fsl-qoriq-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.tar.xz | |
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/oss/mpu401.c')
| -rw-r--r-- | sound/oss/mpu401.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c index 162d07c..58d4a5d 100644 --- a/sound/oss/mpu401.c +++ b/sound/oss/mpu401.c @@ -432,7 +432,7 @@ static void mpu401_input_loop(struct mpu_config *devc) devc->m_busy = 0; } -static irqreturn_t mpuintr(int irq, void *dev_id, struct pt_regs *dummy) +static irqreturn_t mpuintr(int irq, void *dev_id) { struct mpu_config *devc; int dev = (int) dev_id; |