---

yaml
---
r: 273407
b: refs/heads/master
c: 8f1585a
h: refs/heads/master
i:
  273405: 6f0c7eb
  273403: 1093d90
  273399: 6047724
  273391: eb0cea7
  273375: 3f12b1e
  273343: 8d6e397
  273279: 902cdb2
  273151: 0c2669f
  272895: 6dc06f5
  272383: b59ddc0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52b7ad3a63a42b76f4f07cba876479a3c416f1e8
+refs/heads/master: 8f1585aa73a7987cd9b5ee502f42297a28303278

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;