Merge branch 'topic/for-asoc'

2 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h
index 13a1ee95a233..5166935ce66d 100644
--- a/include/linux/mfd/davinci_voicecodec.h
+++ b/include/linux/mfd/davinci_voicecodec.h
@@ -30,6 +30,8 @@
 
 #include <mach/hardware.h>
 
+struct regmap;
+
 /*
  * Register values.
  */
@@ -113,6 +115,7 @@ struct davinci_vc {
 
         /* Memory resources */
         void __iomem *base;
+        struct regmap *regmap;
 
         /* MFD cells */
         struct mfd_cell cells[DAVINCI_VC_CELLS];
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 6dd8893b2a56..81f639bc1ae6 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -230,7 +230,6 @@ struct twl6040 {
         int audpwron;
         int power_count;
         int rev;
-        u8 vibra_ctrl_cache[2];
 
         /* PLL configuration */
         int pll;