---

yaml --- r: 349338 b: refs/heads/master c: 16fa36b h: refs/heads/master v: v3
git-mirror · Jan 18, 2013 · 6000817 · 6000817
1 parent e2826ac
commit 6000817
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b090d8dffd2a036f894c3fa6da3c5cc0e20536c
+refs/heads/master: 16fa36be89305f06a217509fcce4f4aed5df0627
diff --git a/trunk/drivers/pinctrl/mvebu/pinctrl-dove.c b/trunk/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -588,7 +588,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *match =
 		of_match_device(dove_pinctrl_of_match, &pdev->dev);
-	pdev->dev.platform_data = match->data;
+	pdev->dev.platform_data = (void *)match->data;
 
 	/*
 	 * General MPP Configuration Register is part of pdma registers.

diff --git a/trunk/drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/trunk/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
@@ -458,7 +458,7 @@ static int kirkwood_pinctrl_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *match =
 		of_match_device(kirkwood_pinctrl_of_match, &pdev->dev);
-	pdev->dev.platform_data = match->data;
+	pdev->dev.platform_data = (void *)match->data;
 	return mvebu_pinctrl_probe(pdev);
 }