diff --git a/[refs] b/[refs]
index 524ebbeac44d..ad0585ab0b80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2530daa187be3adef2d7cb41bd51f1384e478f2b
+refs/heads/master: ef7906f3204280ccaf8cd7ace974b7c0a1393812
diff --git a/trunk/drivers/power/jz4740-battery.c b/trunk/drivers/power/jz4740-battery.c
index 6b77029e6bdb..8dbc7bfaab14 100644
--- a/trunk/drivers/power/jz4740-battery.c
+++ b/trunk/drivers/power/jz4740-battery.c
@@ -67,7 +67,7 @@ static irqreturn_t jz_battery_irq_handler(int irq, void *devid)
 
 static long jz_battery_read_voltage(struct jz_battery *battery)
 {
-	unsigned long t;
+	long t;
 	unsigned long val;
 	long voltage;