aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/codecs/tpa6130a2.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-12 07:20:30 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-12 07:20:30 +0100
commit2f55eaab56ea083498034c18e09d356594081fca (patch)
tree41563dd4dfe981514915dfcf57e5a5b298c82b6a /sound/soc/codecs/tpa6130a2.c
parent03cfbdf9f7a1d392146718f67e50fa9ab2844f22 (diff)
parent559a8cd629f1b797732fd97afd58b41d8b6fb312 (diff)
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/codecs/tpa6130a2.c')
-rw-r--r--sound/soc/codecs/tpa6130a2.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 0a99f313e21..1f1ac8110be 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -339,7 +339,6 @@ EXPORT_SYMBOL_GPL(tpa6130a2_stereo_enable);
int tpa6130a2_add_controls(struct snd_soc_codec *codec)
{
struct tpa6130a2_data *data;
- struct snd_soc_dapm_context *dapm = &codec->dapm;
if (tpa6130a2_client == NULL)
return -ENODEV;