diff --git a/[refs] b/[refs]
index 1494710c39f2..a3870b74d8e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e41d5a3b7a04e9b82279293055d09cb8164ec29e
+refs/heads/master: 012d12db0c42119356f3ff876289b191c2e730a7
diff --git a/trunk/sound/soc/codecs/wm2000.h b/trunk/sound/soc/codecs/wm2000.h
index 0b6f056f73cc..28a51ed5dc41 100644
--- a/trunk/sound/soc/codecs/wm2000.h
+++ b/trunk/sound/soc/codecs/wm2000.h
@@ -9,11 +9,6 @@
 #ifndef _WM2000_H
 #define _WM2000_H
 
-struct wm2000_setup_data {
-	unsigned short i2c_address;
-	int mclk_div;   /* Set to a non-zero value if MCLK_DIV_2 required */
-};
-
 extern int wm2000_add_controls(struct snd_soc_codec *codec);
 
 #define WM2000_REG_SYS_START	    0x8000