diff --git a/[refs] b/[refs]
index baefed2d6f5e..41416f55a970 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 994f5db65ef4b83db0321842bd43c6bc0a51f000
+refs/heads/master: b83d2ff01376cf3799394693c0dd089f657bdf84
diff --git a/trunk/include/linux/regmap.h b/trunk/include/linux/regmap.h
index 33d5f1d9f882..14b8252d8ed0 100644
--- a/trunk/include/linux/regmap.h
+++ b/trunk/include/linux/regmap.h
@@ -16,11 +16,10 @@
 #include <linux/device.h>
 #include <linux/list.h>
 
-#ifdef CONFIG_REGMAP
-
 struct module;
 struct i2c_client;
 struct spi_device;
+struct regmap;
 
 /* An enum of all the supported cache types */
 enum regcache_type {
@@ -42,6 +41,8 @@ struct reg_default {
 	unsigned int def;
 };
 
+#ifdef CONFIG_REGMAP
+
 /**
  * Configuration for the register map of a device.
  *