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/atmel/snd-soc-afeb9260.c | |
parent | bc3a8a01def4fb0ec0ef8a20d097277b9c6b2a1f (diff) | |
parent | 382225e62bdb8059b7f915b133426425516dd300 (diff) | |
download | op-kernel-dev-cc99a0861fa1c72335dc91a2e06d0b431911d55e.zip op-kernel-dev-cc99a0861fa1c72335dc91a2e06d0b431911d55e.tar.gz |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/soc/atmel/snd-soc-afeb9260.c')
-rw-r--r-- | sound/soc/atmel/snd-soc-afeb9260.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c index da2208e..5e4d499 100644 --- a/sound/soc/atmel/snd-soc-afeb9260.c +++ b/sound/soc/atmel/snd-soc-afeb9260.c @@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = { .cpu_dai_name = "atmel-ssc-dai.0", .codec_dai_name = "tlv320aic23-hifi", .platform_name = "atmel_pcm-audio", - .codec_name = "tlv320aic23-codec.0-0x1a", + .codec_name = "tlv320aic23-codec.0-001a", .init = afeb9260_tlv320aic23_init, .ops = &afeb9260_ops, }; |