diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
| commit | 828006de1bddf83b6ecf03ec459c15f7c7c22db7 (patch) | |
| tree | 73a224bf0371b41c9777c2bad8169ed50bcca879 /sound/soc/tegra/tegra_alc5632.c | |
| parent | d0f47ff17f29740eabbd64e11705b7332241714c (diff) | |
| parent | 5ec65ee589fdaca7298b6303fd74ad6c121a8f38 (diff) | |
| download | op-kernel-dev-828006de1bddf83b6ecf03ec459c15f7c7c22db7.zip op-kernel-dev-828006de1bddf83b6ecf03ec459c15f7c7c22db7.tar.gz | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc
Linus decided to go for another week so here's a few more updates - a
mixed bag here, a few minor diagnostic tweaks, some driver enhancements
and the dmaengine conversion for ep93xx drivers which was tested a while
ago and just waiting for a signoff.
Diffstat (limited to 'sound/soc/tegra/tegra_alc5632.c')
| -rw-r--r-- | sound/soc/tegra/tegra_alc5632.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 2a27725..e45ccd8 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -115,7 +115,6 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_dapm_context *dapm = &codec->dapm; struct device_node *np = codec->card->dev->of_node; struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(codec->card); - int ret; snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, &tegra_alc5632_hs_jack); |
