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/ad1816.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/oss/ad1816.c')
| -rw-r--r-- | sound/oss/ad1816.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/ad1816.c b/sound/oss/ad1816.c index 29057836c644..caabf31193f7 100644 --- a/sound/oss/ad1816.c +++ b/sound/oss/ad1816.c | |||
| @@ -521,7 +521,7 @@ static struct audio_driver ad1816_audio_driver = | |||
| 521 | /* Interrupt handler */ | 521 | /* Interrupt handler */ |
| 522 | 522 | ||
| 523 | 523 | ||
| 524 | static irqreturn_t ad1816_interrupt (int irq, void *dev_id, struct pt_regs *dummy) | 524 | static irqreturn_t ad1816_interrupt (int irq, void *dev_id) |
| 525 | { | 525 | { |
| 526 | unsigned char status; | 526 | unsigned char status; |
| 527 | ad1816_info *devc = (ad1816_info *)dev_id; | 527 | ad1816_info *devc = (ad1816_info *)dev_id; |