From fdcd66e9f440f69517956feacdae06001ad5c0e8 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Wed, 14 Mar 2012 04:38:32 +0400
Subject: [PATCH] --- yaml --- r: 297949 b: refs/heads/master c:
 450ceb2b23ed0feba8c1238f52a1d3feacd5379d h: refs/heads/master i:   297947:
 a8750ad63fb8acbcbf341bd82e5ae282027fa2cf v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/power/ab8500_fg.c            |  2 +-
 trunk/include/linux/mfd/abx500/ab8500-bm.h | 10 ----------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 4d17ca41c700..8698cb68c3c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d329129e9e10e3089550fd9bd692f67687503136
+refs/heads/master: 450ceb2b23ed0feba8c1238f52a1d3feacd5379d
diff --git a/trunk/drivers/power/ab8500_fg.c b/trunk/drivers/power/ab8500_fg.c
index 41ccb70d4018..180c21ad6800 100644
--- a/trunk/drivers/power/ab8500_fg.c
+++ b/trunk/drivers/power/ab8500_fg.c
@@ -812,7 +812,7 @@ static int ab8500_fg_bat_voltage(struct ab8500_fg *di)
 static int ab8500_fg_volt_to_capacity(struct ab8500_fg *di, int voltage)
 {
 	int i, tbl_size;
-	struct v_to_cap *tbl;
+	struct abx500_v_to_cap *tbl;
 	int cap = 0;
 
 	tbl = di->bat->bat_type[di->bat->batt_id].v_to_cap_tbl,
diff --git a/trunk/include/linux/mfd/abx500/ab8500-bm.h b/trunk/include/linux/mfd/abx500/ab8500-bm.h
index f61b7b981ce2..44d86206a253 100644
--- a/trunk/include/linux/mfd/abx500/ab8500-bm.h
+++ b/trunk/include/linux/mfd/abx500/ab8500-bm.h
@@ -255,16 +255,6 @@ struct batres_vs_temp {
 	int resist;
 };
 
-/**
- * struct v_to_cap - Table for translating voltage to capacity
- * @voltage:		Voltage in mV
- * @capacity:		Capacity in percent
- */
-struct v_to_cap {
-	int voltage;
-	int capacity;
-};
-
 /* Forward declaration */
 struct ab8500_fg;