diff --git a/[refs] b/[refs]
index a3f8a7eff416..a40432faf089 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43f674a322aa8a3404df5785f84dc1351a5d84b6
+refs/heads/master: 4a682922817fde4d82fed4303dc902c29d7b2e4e
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index e3271daa3ab9..9a143aebb84b 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -805,6 +805,11 @@ static void print_constraints(struct regulator_dev *rdev)
 		count += sprintf(buf + count, "standby");
 
 	rdev_info(rdev, "%s\n", buf);
+
+	if ((constraints->min_uV != constraints->max_uV) &&
+	    !(constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE))
+		rdev_warn(rdev,
+			  "Voltage range but no REGULATOR_CHANGE_VOLTAGE\n");
 }
 
 static int machine_constraints_voltage(struct regulator_dev *rdev,