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/oss/pas2_card.c | |
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/oss/pas2_card.c')
-rw-r--r-- | sound/oss/pas2_card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c index 4ebb9638746e..25f3a22c52ee 100644 --- a/sound/oss/pas2_card.c +++ b/sound/oss/pas2_card.c | |||
@@ -88,7 +88,7 @@ void pas_write(unsigned char data, int ioaddr) | |||
88 | 88 | ||
89 | /******************* Begin of the Interrupt Handler ********************/ | 89 | /******************* Begin of the Interrupt Handler ********************/ |
90 | 90 | ||
91 | static irqreturn_t pasintr(int irq, void *dev_id, struct pt_regs *dummy) | 91 | static irqreturn_t pasintr(int irq, void *dev_id) |
92 | { | 92 | { |
93 | int status; | 93 | int status; |
94 | 94 | ||