diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-23 14:17:08 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-23 14:17:08 -0400 |
| commit | 639f817fe85db7267ca70cbeab9205dcb5c2ee27 (patch) | |
| tree | bfa55ce4279d6124a854565755118ba92e54c8b2 /sound | |
| parent | 60886e16b41e998aef284454674f8428fc15e875 (diff) | |
| parent | 83e2e4eeb85fd45ff592b79ea11a19df49df872e (diff) | |
Merge remote-tracking branch 'asoc/fix/ep93xx' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/cirrus/ep93xx-ac97.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index ac73c607410a..04491f0e8d1b 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c | |||
| @@ -102,13 +102,13 @@ static struct ep93xx_ac97_info *ep93xx_ac97_info; | |||
| 102 | 102 | ||
| 103 | static struct ep93xx_dma_data ep93xx_ac97_pcm_out = { | 103 | static struct ep93xx_dma_data ep93xx_ac97_pcm_out = { |
| 104 | .name = "ac97-pcm-out", | 104 | .name = "ac97-pcm-out", |
| 105 | .dma_port = EP93XX_DMA_AAC1, | 105 | .port = EP93XX_DMA_AAC1, |
| 106 | .direction = DMA_MEM_TO_DEV, | 106 | .direction = DMA_MEM_TO_DEV, |
| 107 | }; | 107 | }; |
| 108 | 108 | ||
| 109 | static struct ep93xx_dma_data ep93xx_ac97_pcm_in = { | 109 | static struct ep93xx_dma_data ep93xx_ac97_pcm_in = { |
| 110 | .name = "ac97-pcm-in", | 110 | .name = "ac97-pcm-in", |
| 111 | .dma_port = EP93XX_DMA_AAC1, | 111 | .port = EP93XX_DMA_AAC1, |
| 112 | .direction = DMA_DEV_TO_MEM, | 112 | .direction = DMA_DEV_TO_MEM, |
| 113 | }; | 113 | }; |
| 114 | 114 | ||