---

yaml --- r: 251919 b: refs/heads/master c: 17cf8b4 h: refs/heads/master i: 251917: fa861fd 251915: 1d070d4 251911: 6b63001 251903: cf09b58 v: v3
git-mirror · May 26, 2011 · 193db43 · 193db43
1 parent 3b8bcac
commit 193db43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 */