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 /sound/sparc/cs4231.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/sparc/cs4231.c')
| -rw-r--r-- | sound/sparc/cs4231.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 9a06c3bd6944..edeb3d3c4c7e 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
| @@ -1753,7 +1753,7 @@ out_err: | |||
| 1753 | 1753 | ||
| 1754 | #ifdef SBUS_SUPPORT | 1754 | #ifdef SBUS_SUPPORT |
| 1755 | 1755 | ||
| 1756 | static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1756 | static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id) |
| 1757 | { | 1757 | { |
| 1758 | unsigned long flags; | 1758 | unsigned long flags; |
| 1759 | unsigned char status; | 1759 | unsigned char status; |