diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-25 15:19:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-25 15:19:29 +0000 |
| commit | 16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff (patch) | |
| tree | 075e45485d7bf0bf5d8a03f35b013a1bd512f960 /sound/soc/samsung/s3c24xx_simtec_hermes.c | |
| parent | 0d42e6e77f8b872483833a7146286edaaaeb2f39 (diff) | |
| parent | a3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (diff) | |
| download | linux-16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff.tar.bz2 | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/samsung/s3c24xx_simtec_hermes.c')
| -rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_hermes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/s3c24xx_simtec_hermes.c b/sound/soc/samsung/s3c24xx_simtec_hermes.c index d7b3e6e9d783..ce6aef604179 100644 --- a/sound/soc/samsung/s3c24xx_simtec_hermes.c +++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c @@ -84,8 +84,8 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link simtec_dai_aic33 = { .name = "tlv320aic33", .stream_name = "TLV320AIC33", - .codec_name = "tlv320aic3x-codec.0-0x1a", - .cpu_dai_name = "s3c24xx-i2s", + .codec_name = "tlv320aic3x-codec.0-001a", + .cpu_dai_name = "s3c24xx-iis", .codec_dai_name = "tlv320aic3x-hifi", .platform_name = "samsung-audio", .init = simtec_hermes_init, |