diff --git a/[refs] b/[refs]
index 1becf868e467..a3181b1734d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc7e412d431db5da7fa252f4c3ed475ef4af3e8a
+refs/heads/master: 6daa663dc42957ca6c794a84fe07fa09f0273ff9
diff --git a/trunk/drivers/regulator/tps65912-regulator.c b/trunk/drivers/regulator/tps65912-regulator.c
index d2c6542776f1..3a9313e00fac 100644
--- a/trunk/drivers/regulator/tps65912-regulator.c
+++ b/trunk/drivers/regulator/tps65912-regulator.c
@@ -417,7 +417,7 @@ static int tps65912_reg_enable(struct regulator_dev *dev)
 	struct tps65912_reg *pmic = rdev_get_drvdata(dev);
 	struct tps65912 *mfd = pmic->mfd;
 	int id = rdev_get_id(dev);
-	u8 reg;
+	int reg;
 
 	if (id < TPS65912_REG_DCDC1 || id > TPS65912_REG_LDO10)
 		return -EINVAL;