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/drivers/serial-u16550.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/drivers/serial-u16550.c')
| -rw-r--r-- | sound/drivers/serial-u16550.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index 52afb4bd2079..74028b2219c2 100644 --- a/sound/drivers/serial-u16550.c +++ b/sound/drivers/serial-u16550.c | |||
| @@ -292,7 +292,7 @@ static void snd_uart16550_io_loop(snd_uart16550_t * uart) | |||
| 292 | * Note that some devices need OUT2 to be set before they will generate | 292 | * Note that some devices need OUT2 to be set before they will generate |
| 293 | * interrupts at all. (Possibly tied to an internal pull-up on CTS?) | 293 | * interrupts at all. (Possibly tied to an internal pull-up on CTS?) |
| 294 | */ | 294 | */ |
| 295 | static irqreturn_t snd_uart16550_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 295 | static irqreturn_t snd_uart16550_interrupt(int irq, void *dev_id) |
| 296 | { | 296 | { |
| 297 | snd_uart16550_t *uart; | 297 | snd_uart16550_t *uart; |
| 298 | 298 | ||