From 8fe2fec063b8d06f6c0454d93218980092525ee0 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Wed, 22 Aug 2012 20:31:33 -0700
Subject: [PATCH] --- yaml --- r: 330496 b: refs/heads/master c:
 f1ade35253f5026170a5fe17f87d0249f03629dd h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/mfd/88pm860x-core.c      | 4 ++--
 trunk/drivers/power/88pm860x_battery.c | 2 +-
 trunk/drivers/power/88pm860x_charger.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d3091db67845..816cb4e21ea1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a830d28b48bf92944e57058e87d17cee5a7cd2a1
+refs/heads/master: f1ade35253f5026170a5fe17f87d0249f03629dd
diff --git a/trunk/drivers/mfd/88pm860x-core.c b/trunk/drivers/mfd/88pm860x-core.c
index 229cb2920089..76b5b7daf65d 100644
--- a/trunk/drivers/mfd/88pm860x-core.c
+++ b/trunk/drivers/mfd/88pm860x-core.c
@@ -157,8 +157,8 @@ static struct regulator_init_data preg_init_data = {
 	.consumer_supplies	= &preg_supply[0],
 };
 
-static struct regulator_bulk_data chg_desc_regulator_data[] = {
-	{ .supply = "preg", },
+static struct charger_regulator chg_desc_regulator_data[] = {
+	{ .regulator_name = "preg", },
 };
 
 static struct mfd_cell power_devs[] = {
diff --git a/trunk/drivers/power/88pm860x_battery.c b/trunk/drivers/power/88pm860x_battery.c
index 5e905f3db4bf..beed5ecf75e1 100644
--- a/trunk/drivers/power/88pm860x_battery.c
+++ b/trunk/drivers/power/88pm860x_battery.c
@@ -125,7 +125,7 @@ struct ccnt {
  * State of Charge.
  * The first number is mAh(=3.6C), and the second number is percent point.
  */
-int array_soc[][2] = {
+static int array_soc[][2] = {
 	{4170, 100}, {4154, 99}, {4136, 98}, {4122, 97}, {4107, 96},
 	{4102, 95}, {4088, 94}, {4081, 93}, {4070, 92}, {4060, 91},
 	{4053, 90}, {4044, 89}, {4035, 88}, {4028, 87}, {4019, 86},
diff --git a/trunk/drivers/power/88pm860x_charger.c b/trunk/drivers/power/88pm860x_charger.c
index 4fd7614ee839..2dbeb1460901 100644
--- a/trunk/drivers/power/88pm860x_charger.c
+++ b/trunk/drivers/power/88pm860x_charger.c
@@ -632,7 +632,7 @@ static int pm860x_init_charger(struct pm860x_charger_info *info)
 	return 0;
 }
 
-struct pm860x_irq_desc {
+static struct pm860x_irq_desc {
 	const char *name;
 	irqreturn_t (*handler)(int irq, void *data);
 } pm860x_irq_descs[] = {