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_uda134x.c | |
| parent | ALSA: HDA: Fix automute on Thinkpad L412/L512 (diff) | |
| parent | ASoC: correct link specifications for corgi, poodle and spitz (diff) | |
| download | linux-dev-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.tar.xz linux-dev-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.zip | |
Merge branch 'fix/asoc' into for-linus
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 cdc8ecbcb8ef..2c09e93dd566 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c @@ -228,7 +228,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { .stream_name = "UDA134X", .codec_name = "uda134x-hifi", .codec_dai_name = "uda134x-hifi", - .cpu_dai_name = "s3c24xx-i2s", + .cpu_dai_name = "s3c24xx-iis", .ops = &s3c24xx_uda134x_ops, .platform_name = "samsung-audio", }; |