From 78baca0ce4978811ff65ace96b7820ebd099365e Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 19 Jun 2012 14:19:57 +0800
Subject: [PATCH] --- yaml --- r: 312559 b: refs/heads/master c:
 2c19ad43d1a4b0e376a0c764e3c2350afd018fac h: refs/heads/master i:   312557:
 2d6bb3c55f726eba4f17353c8d74a26ea15a61c4   312555:
 d6a4f1f481a067a75a02eeeea1802a536871877a   312551:
 a29b09be38fcbc3fe82c5d445497ec31ff17d3ef   312543:
 1152ba3ed755abf35676a80d42f19ec3dd89e06c v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/regulator/mc13892-regulator.c      | 1 -
 trunk/drivers/regulator/mc13xxx-regulator-core.c | 6 ------
 trunk/drivers/regulator/mc13xxx.h                | 1 -
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 53df3da42e81..a658f7ae0d18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e8e5c34cf1a8beaaf0a6a05c053592693bf8cb4
+refs/heads/master: 2c19ad43d1a4b0e376a0c764e3c2350afd018fac
diff --git a/trunk/drivers/regulator/mc13892-regulator.c b/trunk/drivers/regulator/mc13892-regulator.c
index 6329723b5372..b388b746452e 100644
--- a/trunk/drivers/regulator/mc13892-regulator.c
+++ b/trunk/drivers/regulator/mc13892-regulator.c
@@ -469,7 +469,6 @@ static int mc13892_sw_regulator_set_voltage_sel(struct regulator_dev *rdev,
 }
 
 static struct regulator_ops mc13892_sw_regulator_ops = {
-	.is_enabled = mc13xxx_sw_regulator_is_enabled,
 	.list_voltage = regulator_list_voltage_table,
 	.set_voltage_sel = mc13892_sw_regulator_set_voltage_sel,
 	.get_voltage = mc13892_sw_regulator_get_voltage,
diff --git a/trunk/drivers/regulator/mc13xxx-regulator-core.c b/trunk/drivers/regulator/mc13xxx-regulator-core.c
index 8a6b050ff5aa..d6eda28ca5d0 100644
--- a/trunk/drivers/regulator/mc13xxx-regulator-core.c
+++ b/trunk/drivers/regulator/mc13xxx-regulator-core.c
@@ -170,12 +170,6 @@ struct regulator_ops mc13xxx_fixed_regulator_ops = {
 };
 EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops);
 
-int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev)
-{
-	return 1;
-}
-EXPORT_SYMBOL_GPL(mc13xxx_sw_regulator_is_enabled);
-
 #ifdef CONFIG_OF
 int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
 {
diff --git a/trunk/drivers/regulator/mc13xxx.h b/trunk/drivers/regulator/mc13xxx.h
index 9a8f72ce718e..8343a25888d2 100644
--- a/trunk/drivers/regulator/mc13xxx.h
+++ b/trunk/drivers/regulator/mc13xxx.h
@@ -33,7 +33,6 @@ struct mc13xxx_regulator_priv {
 };
 
 extern int mc13xxx_sw_regulator(struct regulator_dev *rdev);
-extern int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev);
 extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev,
 		int min_uV, int max_uV, unsigned *selector);
 extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev);