diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-11 14:48:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-11 14:48:09 +0100 |
| commit | cc99a0861fa1c72335dc91a2e06d0b431911d55e (patch) | |
| tree | b5bba9600470f8a5e417519b7c2d5fd13d079c3b /sound/soc/samsung/s3c24xx_simtec_hermes.c | |
| parent | bc3a8a01def4fb0ec0ef8a20d097277b9c6b2a1f (diff) | |
| parent | 382225e62bdb8059b7f915b133426425516dd300 (diff) | |
Merge branch 'fix/misc' into topic/misc
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, |