diff --git a/[refs] b/[refs]
index ca8e03660118..95d9aec7d57f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5619d0ba97cd336a100121cf8f2968c4b1f6c848
+refs/heads/master: ecc2edd56c49fa31a0a9ed15a7bf810ae79d3b85
diff --git a/trunk/drivers/power/olpc_battery.c b/trunk/drivers/power/olpc_battery.c
index 1630add1a6de..55b10b813353 100644
--- a/trunk/drivers/power/olpc_battery.c
+++ b/trunk/drivers/power/olpc_battery.c
@@ -231,11 +231,9 @@ static int olpc_bat_get_charge_full_design(union power_supply_propval *val)
 
 	case POWER_SUPPLY_TECHNOLOGY_LiFe:
 		switch (mfr) {
-		case 1: /* Gold Peak */
-			val->intval = 2800000;
-			break;
+		case 1: /* Gold Peak, fall through */
 		case 2: /* BYD */
-			val->intval = 3100000;
+			val->intval = 2800000;
 			break;
 		default:
 			return -EIO;