Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/fix/ep93xx' into asoc-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Jul 23, 2013
2 parents 60886e1 + 83e2e4e commit 639f817
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/cirrus/ep93xx-ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down

0 comments on commit 639f817

Please sign in to comment.