diff options
| author | NeilBrown <neilb@suse.de> | 2013-07-26 11:04:53 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2013-07-26 11:04:53 +1000 |
| commit | 1bf3c840b8061c526c0f442d9697311572d9cc6e (patch) | |
| tree | b6fc101b797024e47cec240b90e12864dc70fa0f /sound/soc/omap/omap-hdmi-card.c | |
| parent | 855ee922b7f6df94a36bb8acff0a354550203e39 (diff) | |
| parent | b3a3a9c441e2c8f6b6760de9331023a7906a4ac6 (diff) | |
| download | kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.zip kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.tar.gz kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.tar.bz2 | |
Merge branch 'master' into mainline
Conflicts:
drivers/mmc/core/core.c
drivers/pwm/Kconfig
drivers/pwm/Makefile
Diffstat (limited to 'sound/soc/omap/omap-hdmi-card.c')
| -rw-r--r-- | sound/soc/omap/omap-hdmi-card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-hdmi-card.c b/sound/soc/omap/omap-hdmi-card.c index d4eaa92..7e66e9c 100644 --- a/sound/soc/omap/omap-hdmi-card.c +++ b/sound/soc/omap/omap-hdmi-card.c @@ -35,7 +35,7 @@ static struct snd_soc_dai_link omap_hdmi_dai = { .cpu_dai_name = "omap-hdmi-audio-dai", .platform_name = "omap-pcm-audio", .codec_name = "hdmi-audio-codec", - .codec_dai_name = "omap-hdmi-hifi", + .codec_dai_name = "hdmi-hifi", }; static struct snd_soc_card snd_soc_omap_hdmi = { |