Merge branch 'ipmi'

[~andy/linux] / drivers / regulator / ab3100.c

diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index 3be9e46594a134286b59010c3fa83511fa9c510e..7d5eaa874b2da9337e387b1271bd2e38a3d25d2e 100644 (file)
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -660,7 +660,7 @@ ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
 
 static int ab3100_regulators_probe(struct platform_device *pdev)
 {
-       struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
+       struct ab3100_platform_data *plfdata = dev_get_platdata(&pdev->dev);
        struct device_node *np = pdev->dev.of_node;
        int err = 0;
        u8 data;