diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-24 11:42:34 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-07-24 11:42:34 +0200 |
commit | 43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000 (patch) | |
tree | 7184a24f04c72987e725e50e66db530e6f618220 /sound/soc/cirrus/ep93xx-ac97.c | |
parent | fee4b700a4e9e446151eb5a03874ca8666323113 (diff) | |
parent | c5ae4dca11523dff15cfb1763b64a71b805976aa (diff) |
Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small updates again, the sgtl5000 one fixes some newly triggered
issues due to some probe ordering changes which were introduced in the
last merge window.
Diffstat (limited to 'sound/soc/cirrus/ep93xx-ac97.c')
-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, }; |