diff --git a/[refs] b/[refs]
index ea15bc0df259..f50b98b58175 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cbf811dfd027bde8504e541d0009c5722b98be5
+refs/heads/master: f5ee10ab42c76f36eea1bd6f7a35da387635ebf9
diff --git a/trunk/drivers/regulator/dummy.h b/trunk/drivers/regulator/dummy.h
index 3921c0e24249..97a11b7e8882 100644
--- a/trunk/drivers/regulator/dummy.h
+++ b/trunk/drivers/regulator/dummy.h
@@ -22,10 +22,6 @@ struct regulator_dev;
 
 extern struct regulator_dev *dummy_regulator_rdev;
 
-#ifdef CONFIG_REGULATOR_DUMMY
 void __init regulator_dummy_init(void);
-#else
-static inline void regulator_dummy_init(void) { }
-#endif
 
 #endif