diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-12-10 03:00:45 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-10 03:00:45 -0500 |
commit | 97768a8e658605a905ba0d908d1b23b475170bed (patch) | |
tree | 0431dd9a118c138d164c263033a53502e4c01586 /sound/soc/samsung/s3c24xx_uda134x.c | |
parent | 9621055fbbb190264cb6a8182b70e3f0f917d770 (diff) | |
parent | 7a79e94e973639da7bf1b8242d504f9db9e5e848 (diff) |
Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.8
Some incremental updates, nothing too exciting. The biggest block here
is the __dev annotation removal stuff from Bill, everything else is the
usual driver-specific stuff - a combination of fixes and development.
There will be at least more more set of fixes to come but I wanted to
get these out ready for the merge window to make sure Bill's stuff makes
it in.
Diffstat (limited to 'sound/soc/samsung/s3c24xx_uda134x.c')
-rw-r--r-- | sound/soc/samsung/s3c24xx_uda134x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index d731042e51b0..333e1b7f06c7 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c | |||
@@ -224,7 +224,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { | |||
224 | .codec_dai_name = "uda134x-hifi", | 224 | .codec_dai_name = "uda134x-hifi", |
225 | .cpu_dai_name = "s3c24xx-iis", | 225 | .cpu_dai_name = "s3c24xx-iis", |
226 | .ops = &s3c24xx_uda134x_ops, | 226 | .ops = &s3c24xx_uda134x_ops, |
227 | .platform_name = "samsung-audio", | 227 | .platform_name = "s3c24xx-iis", |
228 | }; | 228 | }; |
229 | 229 | ||
230 | static struct snd_soc_card snd_soc_s3c24xx_uda134x = { | 230 | static struct snd_soc_card snd_soc_s3c24xx_uda134x = { |