diff --git a/[refs] b/[refs]
index 6c8301d9ff58..29f11df4afa5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f306441e97f8f9d27c43a536360fe221f675a71
+refs/heads/master: bbcf61ca8dcf093bd030a4dafb662b714676652d
diff --git a/trunk/drivers/base/regmap/internal.h b/trunk/drivers/base/regmap/internal.h
index 7e14d5a6f53e..a98493cde5c3 100644
--- a/trunk/drivers/base/regmap/internal.h
+++ b/trunk/drivers/base/regmap/internal.h
@@ -61,9 +61,9 @@ extern void regmap_debugfs_initcall(void);
 extern void regmap_debugfs_init(struct regmap *map);
 extern void regmap_debugfs_exit(struct regmap *map);
 #else
-void regmap_debugfs_initcall(void) { }
-void regmap_debugfs_init(struct regmap *map) { }
-void regmap_debugfs_exit(struct regmap *map) { }
+static inline void regmap_debugfs_initcall(void) { }
+static inline void regmap_debugfs_init(struct regmap *map) { }
+static inline void regmap_debugfs_exit(struct regmap *map) { }
 #endif
 
 #endif