diff --git a/[refs] b/[refs]
index 189417e90197..5a77927fc2d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 561864e8e3c263ff72bd0888aca80089027195ca
+refs/heads/master: 9c19bc0444490e76197f47316c649590dc6f10a4
diff --git a/trunk/include/linux/regulator/machine.h b/trunk/include/linux/regulator/machine.h
index 9328090eca20..73a88f6cbb1c 100644
--- a/trunk/include/linux/regulator/machine.h
+++ b/trunk/include/linux/regulator/machine.h
@@ -171,6 +171,12 @@ struct regulator_init_data {
 
 int regulator_suspend_prepare(suspend_state_t state);
 
+#ifdef CONFIG_REGULATOR
 void regulator_has_full_constraints(void);
+#else
+static inline void regulator_has_full_constraints(void)
+{
+}
+#endif
 
 #endif