diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-17 16:20:19 (GMT) |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-17 16:20:19 (GMT) |
commit | e95e939d15d0b14d210d43553f58fb7cefe8d93c (patch) | |
tree | bde2171bdbd635ba5daf46e369b391459cba0209 /sound/soc | |
parent | c44ddeb8370d3b528e2b8287c18e14acb81ee1a8 (diff) | |
parent | 22a4adf25826d1128d116dd4a313f66175c703bd (diff) | |
download | linux-e95e939d15d0b14d210d43553f58fb7cefe8d93c.tar.xz |
Merge remote-tracking branch 'asoc/topic/dwc' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/dwc/designware_i2s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index 593a3ea1..70eb37a 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -1,7 +1,7 @@ /* * ALSA SoC Synopsys I2S Audio Layer * - * sound/soc/spear/designware_i2s.c + * sound/soc/dwc/designware_i2s.c * * Copyright (C) 2010 ST Microelectronics * Rajeev Kumar <rajeev-dlh.kumar@st.com> @@ -396,7 +396,7 @@ static int dw_i2s_probe(struct platform_device *pdev) } if (cap & DWC_I2S_PLAY) { - dev_dbg(&pdev->dev, " SPEAr: play supported\n"); + dev_dbg(&pdev->dev, " designware: play supported\n"); dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM; dw_i2s_dai->playback.channels_max = pdata->channel; dw_i2s_dai->playback.formats = pdata->snd_fmts; @@ -404,7 +404,7 @@ static int dw_i2s_probe(struct platform_device *pdev) } if (cap & DWC_I2S_RECORD) { - dev_dbg(&pdev->dev, "SPEAr: record supported\n"); + dev_dbg(&pdev->dev, "designware: record supported\n"); dw_i2s_dai->capture.channels_min = MIN_CHANNEL_NUM; dw_i2s_dai->capture.channels_max = pdata->channel; dw_i2s_dai->capture.formats = pdata->snd_fmts; |