diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 12:53:12 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 12:53:12 +1000 |
| commit | 7bfeea05d9b1cc75c2d7410b92b7774870688379 (patch) | |
| tree | 39627048b18ab9bd2e7437af046579ea67ea53e2 /sound/soc/samsung/s3c24xx_simtec_hermes.c | |
| parent | f9a3d1d74bdacf8a5ef8025233e61546cb809dc8 (diff) | |
| parent | dcc3c4c016481de3fdb99c1f6ecb04d4229513d4 (diff) | |
| download | op-kernel-dev-7bfeea05d9b1cc75c2d7410b92b7774870688379.zip op-kernel-dev-7bfeea05d9b1cc75c2d7410b92b7774870688379.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: HDA: Fix automute on Thinkpad L412/L512
ALSA: HDA: Fix dmesg output of HDMI supported bits
ALSA: fix invalid hardware.h include in ac97c for AVR32 architecture
ASoC: correct link specifications for corgi, poodle and spitz
ASoC: Samsung: Fix outdated cpu_dai_name for s3c24xx i2s
ASoC: Fix codec device id format used by some dai_links
ALSA: azt3328 - fix broken AZF_FMT_XLATE macro
ALSA: Xonar, CS43xx: Don't overrun static array
ASoC: Handle low measured DC offsets for wm_hubs devices
ASoC: da8xx/omap-l1xx: match codec_name with i2c ids
ASoC: WM8994: fix wrong value in tristate function
ASoC: WM8995: Fix incorrect use of snd_soc_update_bits()
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 bb4292e..08fcaaa 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, |
