diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /sound/oss/uart401.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/oss/uart401.c')
| -rw-r--r-- | sound/oss/uart401.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c index 8e18b6e25818..a446b826d5fc 100644 --- a/sound/oss/uart401.c +++ b/sound/oss/uart401.c | |||
| @@ -96,7 +96,7 @@ static void uart401_input_loop(uart401_devc * devc) | |||
| 96 | printk(KERN_WARNING "Too much work in interrupt on uart401 (0x%X). UART jabbering ??\n", devc->base); | 96 | printk(KERN_WARNING "Too much work in interrupt on uart401 (0x%X). UART jabbering ??\n", devc->base); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | irqreturn_t uart401intr(int irq, void *dev_id, struct pt_regs *dummy) | 99 | irqreturn_t uart401intr(int irq, void *dev_id) |
| 100 | { | 100 | { |
| 101 | uart401_devc *devc = dev_id; | 101 | uart401_devc *devc = dev_id; |
| 102 | 102 | ||