From 52d1ce7b93b6b55355c00c0d985be7829e815d27 Mon Sep 17 00:00:00 2001 From: Ian Lartey Date: Wed, 1 Sep 2010 18:09:27 +0100 Subject: [PATCH] --- yaml --- r: 217395 b: refs/heads/master c: 2d98dae206daad05d794255b15bd0eb31c9294d0 h: refs/heads/master i: 217393: 64749d87dc031c6f95407a169eef2975c2241c8d 217391: 4dcefacfac2cf07ef95f399963105c7f797bea1e v: v3 --- [refs] | 2 +- trunk/drivers/power/wm831x_power.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 96bd91aab74e..a878694a8968 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd0964c5f1bdaa979a7ea5cfc9af2de9b0a1e766 +refs/heads/master: 2d98dae206daad05d794255b15bd0eb31c9294d0 diff --git a/trunk/drivers/power/wm831x_power.c b/trunk/drivers/power/wm831x_power.c index fbcc36dae470..a57a94150cb8 100644 --- a/trunk/drivers/power/wm831x_power.c +++ b/trunk/drivers/power/wm831x_power.c @@ -267,7 +267,6 @@ static void wm831x_config_battery(struct wm831x *wm831x) ret = wm831x_set_bits(wm831x, WM831X_CHARGER_CONTROL_1, WM831X_CHG_ENA_MASK | WM831X_CHG_FAST_MASK | - WM831X_CHG_ITERM_MASK | WM831X_CHG_ITERM_MASK, reg1); if (ret != 0)