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/oss/uart6850.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/oss/uart6850.c')
| -rw-r--r-- | sound/oss/uart6850.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c index 501d3e654a67..f3f914aa92ee 100644 --- a/sound/oss/uart6850.c +++ b/sound/oss/uart6850.c | |||
| @@ -104,7 +104,7 @@ static void uart6850_input_loop(void) | |||
| 104 | } | 104 | } |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | static irqreturn_t m6850intr(int irq, void *dev_id, struct pt_regs *dummy) | 107 | static irqreturn_t m6850intr(int irq, void *dev_id) |
| 108 | { | 108 | { |
| 109 | if (input_avail()) | 109 | if (input_avail()) |
| 110 | uart6850_input_loop(); | 110 | uart6850_input_loop(); |