From 193db43b3bc0c0683406556bd6882beffc2e8c32 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Thu, 26 May 2011 10:06:31 +0200
Subject: [PATCH] --- yaml --- r: 251919 b: refs/heads/master c:
 17cf8b429341869c154268f9d92d32a74295a29a h: refs/heads/master i:   251917:
 fa861fda781459be10b7867cbfa434d83ba00c7c   251915:
 1d070d4065ec069c5b027f7099747a85430ce1dd   251911:
 6b63001a85903310cb7bbd7551dfb40001d62523   251903:
 cf09b58786132a68f0f916de43b7e625fce062c7 v: v3

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

diff --git a/[refs] b/[refs]
index 8fcb24d60f11..87968cf80168 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e45be4b5fcccb241101ad1aa1e15581ad2071393
+refs/heads/master: 17cf8b429341869c154268f9d92d32a74295a29a
diff --git a/trunk/drivers/regulator/db8500-prcmu.c b/trunk/drivers/regulator/db8500-prcmu.c
index 1089a961616e..e5f7b8fe51f4 100644
--- a/trunk/drivers/regulator/db8500-prcmu.c
+++ b/trunk/drivers/regulator/db8500-prcmu.c
@@ -13,7 +13,6 @@
 #include <linux/err.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
-#include <linux/mfd/core.h>
 #include <linux/mfd/db8500-prcmu.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
@@ -471,7 +470,8 @@ static struct db8500_regulator_info
 
 static int __devinit db8500_regulator_probe(struct platform_device *pdev)
 {
-	struct regulator_init_data *db8500_init_data = mfd_get_data(pdev);
+	struct regulator_init_data *db8500_init_data =
+					dev_get_platdata(&pdev->dev);
 	int i, err;
 
 	/* register all regulators */