From e2b158ccf4d5190a8b92f3ba253b0f47f002c358 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 29 Dec 2011 11:13:15 +0000
Subject: [PATCH] --- yaml --- r: 293151 b: refs/heads/master c:
 ad6cdec507d877189c9813655dfa30579256a2fc h: refs/heads/master i:   293149:
 8458239fbc4b7e4d5933481342eecd31fea56e02   293147:
 7a4ff698036db013e1ecb42b0666b5f01b8c4271   293143:
 2b0dd92394ba165dcda2d4350774f3563b6d3e9d   293135:
 8cd3a0e1b276b0a9d6af0abe9810401af886ac13   293119:
 14741992298c2dedc59c825119346d9cbf14809a v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8978.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 87ed0bdb4103..2212f46ff026 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d6df67583bb40fdc365210740bcce0bd27420f7
+refs/heads/master: ad6cdec507d877189c9813655dfa30579256a2fc
diff --git a/trunk/sound/soc/codecs/wm8978.c b/trunk/sound/soc/codecs/wm8978.c
index 0b1f7ada17bc..2ba8f8c88ba6 100644
--- a/trunk/sound/soc/codecs/wm8978.c
+++ b/trunk/sound/soc/codecs/wm8978.c
@@ -50,7 +50,6 @@ static const u16 wm8978_reg[WM8978_CACHEREGNUM] = {
 
 /* codec private data */
 struct wm8978_priv {
-	enum snd_soc_control_type control_type;
 	unsigned int f_pllout;
 	unsigned int f_mclk;
 	unsigned int f_256fs;