From 708efcfeef07524d631241aac46457d93b620b11 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 19 Sep 2011 11:33:17 +0200
Subject: [PATCH] --- yaml --- r: 273407 b: refs/heads/master c:
 8f1585aa73a7987cd9b5ee502f42297a28303278 h: refs/heads/master i:   273405:
 6f0c7eb4db3db0125910b48dc8b5524febb6053c   273403:
 1093d90b328022a3052e7b94354e30b1fae4d971   273399:
 604772403f399b99ab734961618f770cf94cd0b3   273391:
 eb0cea7f15bf15ca9e4d56d0b72ef4f9b30d9952   273375:
 3f12b1eac33deed4e814411f786e6a7dfdb13220   273343:
 8d6e397ce2079d21cd9694f70405940f1586d87b   273279:
 902cdb2fdffee465e21bc0f6124e4fa9c88a88ae   273151:
 0c2669f67742e981f13947241fe644836c0d4f74   272895:
 6dc06f51036516f1b7ceef01ba174940e74d9c2a   272383:
 b59ddc0bf7a22a5ecab80c0086a3902da70a1d43 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/regulator/mc13783-regulator.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1880760592b9..0d9442723c3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52b7ad3a63a42b76f4f07cba876479a3c416f1e8
+refs/heads/master: 8f1585aa73a7987cd9b5ee502f42297a28303278
diff --git a/trunk/drivers/regulator/mc13783-regulator.c b/trunk/drivers/regulator/mc13783-regulator.c
index 730f43ad415b..cb2841feeefd 100644
--- a/trunk/drivers/regulator/mc13783-regulator.c
+++ b/trunk/drivers/regulator/mc13783-regulator.c
@@ -336,9 +336,9 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
 {
 	struct mc13xxx_regulator_priv *priv;
 	struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
-	struct mc13783_regulator_platform_data *pdata =
+	struct mc13xxx_regulator_platform_data *pdata =
 		dev_get_platdata(&pdev->dev);
-	struct mc13783_regulator_init_data *init_data;
+	struct mc13xxx_regulator_init_data *init_data;
 	int i, ret;
 
 	dev_dbg(&pdev->dev, "%s id %d\n", __func__, pdev->id);
@@ -381,7 +381,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
 static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
 {
 	struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
-	struct mc13783_regulator_platform_data *pdata =
+	struct mc13xxx_regulator_platform_data *pdata =
 		dev_get_platdata(&pdev->dev);
 	int i;