diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /sound/oss/au1550_ac97.c | |
| parent | b0df3bd1e553e901ec7297267611a5db88240b38 (diff) | |
| parent | e8216dee838c09776680a6f1a2e54d81f3cdfa14 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'sound/oss/au1550_ac97.c')
| -rw-r--r-- | sound/oss/au1550_ac97.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index 4cdb86252d67..219795171c71 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c | |||
| @@ -719,8 +719,7 @@ prog_dmabuf_dac(struct au1550_state *s) | |||
| 719 | } | 719 | } |
| 720 | 720 | ||
| 721 | 721 | ||
| 722 | static void | 722 | static void dac_dma_interrupt(int irq, void *dev_id) |
| 723 | dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | ||
| 724 | { | 723 | { |
| 725 | struct au1550_state *s = (struct au1550_state *) dev_id; | 724 | struct au1550_state *s = (struct au1550_state *) dev_id; |
| 726 | struct dmabuf *db = &s->dma_dac; | 725 | struct dmabuf *db = &s->dma_dac; |
| @@ -754,8 +753,7 @@ dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 754 | } | 753 | } |
| 755 | 754 | ||
| 756 | 755 | ||
| 757 | static void | 756 | static void adc_dma_interrupt(int irq, void *dev_id) |
| 758 | adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | ||
| 759 | { | 757 | { |
| 760 | struct au1550_state *s = (struct au1550_state *)dev_id; | 758 | struct au1550_state *s = (struct au1550_state *)dev_id; |
| 761 | struct dmabuf *dp = &s->dma_adc; | 759 | struct dmabuf *dp = &s->dma_adc; |