summaryrefslogtreecommitdiff
path: root/sound/soc/ux500/ux500_pcm.c
diff options
context:
space:
mode:
authorOla Lilja <ola.o.lilja@stericsson.com>2011-12-07 13:29:06 +0100
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 09:01:04 +0100
commitf78cde23f65861db0de2e7801b8fb77846901da1 (patch)
treef11ffd048d4e381c7d07951ea5a2135c687235a3 /sound/soc/ux500/ux500_pcm.c
parent4976f37ff7dc576520feeafdd449ff247c451d41 (diff)
ASoC: Ux500: Move i2s into ASoC and remove old i2s-layer
The old multi-client i2s driver-layer located in drivers/misc/i2s is removed and the MSP-operation for i2s is moved into the file ux500_msp_i2s.c in the Ux500 ASoC-folder. ST-Ericsson ID: - ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I11c9021bb7b2385afba9a3e658b5bef7fe9fdb68 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/41704
Diffstat (limited to 'sound/soc/ux500/ux500_pcm.c')
-rw-r--r--sound/soc/ux500/ux500_pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c
index 0161ffdf3f4..29b3f5e0ffb 100644
--- a/sound/soc/ux500/ux500_pcm.c
+++ b/sound/soc/ux500/ux500_pcm.c
@@ -272,7 +272,7 @@ static int ux500_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
private->msp_id,
stream_id);
if (ret) {
- pr_err("%s: Failed to configure sg-list!\n", __func__);
+ pr_err("%s: Failed to configure I2S!\n", __func__);
return -EINVAL;
}
break;