diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-01-28 08:25:43 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-28 08:25:43 +0100 |
commit | dcc3c4c016481de3fdb99c1f6ecb04d4229513d4 (patch) | |
tree | d3d40306e6dfe0971c6f7fca6a0e37bbe66d2215 /sound/soc/samsung/s3c24xx_simtec_hermes.c | |
parent | ded9f5238bb719737f82b0b5b957937cb0203804 (diff) | |
parent | a3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (diff) |
Merge branch 'fix/asoc' into for-linus
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 bb4292e3596..08fcaaa6690 100644 --- a/sound/soc/samsung/s3c24xx_simtec_hermes.c +++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c @@ -94,8 +94,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, |