From 60008172a2b4513824658ef56f313ef49f5b5f2d Mon Sep 17 00:00:00 2001 From: Andrew Lunn Date: Wed, 9 Jan 2013 19:28:09 +0100 Subject: [PATCH] --- yaml --- r: 349338 b: refs/heads/master c: 16fa36be89305f06a217509fcce4f4aed5df0627 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/mvebu/pinctrl-dove.c | 2 +- trunk/drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b7195f2c0a89..cf0d21e88c74 100644 --- 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 index 69aba3697287..428ea96a94d3 100644 --- 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 index f12084e18057..7907e7ced944 100644 --- 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); }