From cf09b58786132a68f0f916de43b7e625fce062c7 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Wed, 6 Apr 2011 00:41:43 +0200
Subject: [PATCH] --- yaml --- r: 251903 b: refs/heads/master c:
 a771e36e16e9fdacb2bb8d3b9be50be68f211b82 h: refs/heads/master i:   251901:
 466a9347c37678a339df4c6aa555047288dbe719   251899:
 fe6ed0eedd9c54d1dbc62f0fcc6bc33253f4b8cc   251895:
 89e17d33647a24a863e2b3f290ab3f5cb309e383   251887:
 ef81e89bc7c690f3fc36cb772f1b579b920f49dc   251871:
 d85578facedf4dde877bb6149b99eb5b50d3a1e2   251839:
 164d3b0df0fa1836f5c12c6c27915686035b2d58   251775:
 bec92d8a63c270b1423d831ad1a3b41fa9086795   251647:
 810ff7812b9c683cf4597d22234ce801675a5395   251391:
 8f1d36cd1f001a5a43df948a2ac35abf87f1c9a2   250879:
 8f06f45f87f73e4995ebd5b68e21f11e9228bb60   249855:
 097017c37626a2f13eefdb3620986e715018c5cb v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/ab3100-core.c  | 6 ++++--
 trunk/drivers/regulator/ab3100.c | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8915c0ccb3f2..507b93de8d38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f235a3785dbcfb324ff228048b859a3bd1e1a59
+refs/heads/master: a771e36e16e9fdacb2bb8d3b9be50be68f211b82
diff --git a/trunk/drivers/mfd/ab3100-core.c b/trunk/drivers/mfd/ab3100-core.c
index a751927047ac..a20e1c41bed2 100644
--- a/trunk/drivers/mfd/ab3100-core.c
+++ b/trunk/drivers/mfd/ab3100-core.c
@@ -949,8 +949,10 @@ static int __devinit ab3100_probe(struct i2c_client *client,
 		goto exit_no_ops;
 
 	/* Set up and register the platform devices. */
-	for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++)
-		ab3100_devs[i].mfd_data = ab3100_plf_data;
+	for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++) {
+		ab3100_devs[i].platform_data = ab3100_plf_data;
+		ab3100_devs[i].pdata_size = sizeof(struct ab3100_platform_data);
+	}
 
 	err = mfd_add_devices(&client->dev, 0, ab3100_devs,
 		ARRAY_SIZE(ab3100_devs), NULL, 0);
diff --git a/trunk/drivers/regulator/ab3100.c b/trunk/drivers/regulator/ab3100.c
index b1d77946e9c6..585e4946fe0a 100644
--- a/trunk/drivers/regulator/ab3100.c
+++ b/trunk/drivers/regulator/ab3100.c
@@ -17,7 +17,6 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/mfd/abx500.h>
-#include <linux/mfd/core.h>
 
 /* LDO registers and some handy masking definitions for AB3100 */
 #define AB3100_LDO_A		0x40
@@ -582,7 +581,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {
 
 static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
 {
-	struct ab3100_platform_data *plfdata = mfd_get_data(pdev);
+	struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
 	int err = 0;
 	u8 data;
 	int i;