diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-23 19:17:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-23 19:17:08 +0100 |
| commit | 639f817fe85db7267ca70cbeab9205dcb5c2ee27 (patch) | |
| tree | bfa55ce4279d6124a854565755118ba92e54c8b2 /sound | |
| parent | 60886e16b41e998aef284454674f8428fc15e875 (diff) | |
| parent | 83e2e4eeb85fd45ff592b79ea11a19df49df872e (diff) | |
| download | linux-639f817fe85db7267ca70cbeab9205dcb5c2ee27.tar.gz linux-639f817fe85db7267ca70cbeab9205dcb5c2ee27.tar.bz2 linux-639f817fe85db7267ca70cbeab9205dcb5c2ee27.zip | |
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; static struct ep93xx_dma_data ep93xx_ac97_pcm_out = { .name = "ac97-pcm-out", - .dma_port = EP93XX_DMA_AAC1, + .port = EP93XX_DMA_AAC1, .direction = DMA_MEM_TO_DEV, }; static struct ep93xx_dma_data ep93xx_ac97_pcm_in = { .name = "ac97-pcm-in", - .dma_port = EP93XX_DMA_AAC1, + .port = EP93XX_DMA_AAC1, .direction = DMA_DEV_TO_MEM, }; |