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/arm/pxa2xx-pcm.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/arm/pxa2xx-pcm.c')
| -rw-r--r-- | sound/arm/pxa2xx-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c index 4938ef10b813..e8cf904b8358 100644 --- a/sound/arm/pxa2xx-pcm.c +++ b/sound/arm/pxa2xx-pcm.c | |||
| @@ -137,7 +137,7 @@ static int pxa2xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) | |||
| 137 | return ret; | 137 | return ret; |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | static void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id, struct pt_regs *regs) | 140 | static void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id) |
| 141 | { | 141 | { |
| 142 | struct snd_pcm_substream *substream = dev_id; | 142 | struct snd_pcm_substream *substream = dev_id; |
| 143 | struct pxa2xx_runtime_data *rtd = substream->runtime->private_data; | 143 | struct pxa2xx_runtime_data *rtd = substream->runtime->private_data; |