diff --git a/[refs] b/[refs]
index 7cb74b1a36df..876e1dcc1889 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d86ad37ece5fd064aa7c4fba5dd4378679c2cbf
+refs/heads/master: 0e8f1398a388bbaa5ca965711b9ed5ac4794332d
diff --git a/trunk/include/linux/i2c/twl.h b/trunk/include/linux/i2c/twl.h
index 9a5e28462324..7278c72479d1 100644
--- a/trunk/include/linux/i2c/twl.h
+++ b/trunk/include/linux/i2c/twl.h
@@ -73,9 +73,7 @@
 #define TWL4030_MODULE_SECURED_REG	0x17
 
 #define TWL_MODULE_USB		TWL4030_MODULE_USB
-#define TWL_MODULE_AUDIO_VOICE	TWL4030_MODULE_AUDIO_VOICE
 #define TWL_MODULE_PIH		TWL4030_MODULE_PIH
-#define TWL_MODULE_MADC		TWL4030_MODULE_MADC
 #define TWL_MODULE_MAIN_CHARGE	TWL4030_MODULE_MAIN_CHARGE
 #define TWL_MODULE_PM_MASTER	TWL4030_MODULE_PM_MASTER
 #define TWL_MODULE_PM_RECEIVER	TWL4030_MODULE_PM_RECEIVER