diff --git a/[refs] b/[refs]
index f4d9fa64a20b..2b8f2aea6271 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 302991379c2940975cd9c6dc377abe0b522b5010
+refs/heads/master: d7e08f1b8fcb85968c35ddecbf912bdab4cf2508
diff --git a/trunk/arch/arm/plat-omap/include/plat/voltage.h b/trunk/arch/arm/plat-omap/include/plat/voltage.h
index 0ff123399f3b..9943c667f8e1 100644
--- a/trunk/arch/arm/plat-omap/include/plat/voltage.h
+++ b/trunk/arch/arm/plat-omap/include/plat/voltage.h
@@ -134,7 +134,10 @@ void omap_change_voltscale_method(struct voltagedomain *voltdm,
 int omap_voltage_late_init(void);
 #else
 static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm,
-		struct omap_volt_pmic_info *pmic_info) {}
+		struct omap_volt_pmic_info *pmic_info)
+{
+	return -EINVAL;
+}
 static inline  void omap_change_voltscale_method(struct voltagedomain *voltdm,
 		int voltscale_method) {}
 static inline int omap_voltage_late_init(void)