---

yaml --- r: 336385 b: refs/heads/master c: dffa912 h: refs/heads/master i: 336383: 1aed766 v: v3
git-mirror · Oct 28, 2012 · 342eb09 · 342eb09
1 parent 661620f
commit 342eb09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a728c7cdd033f0cbeacc302d2409a2428e68e1be
+refs/heads/master: dffa91230f5202a78ccc97960ae1c84e533b036a
diff --git a/trunk/drivers/pinctrl/pinctrl-at91.c b/trunk/drivers/pinctrl/pinctrl-at91.c
@@ -838,7 +838,7 @@ static int __devinit at91_pinctrl_probe_dt(struct platform_device *pdev,
 		return -ENODEV;
 
 	info->dev = &pdev->dev;
-	info->ops =
+	info->ops = (struct at91_pinctrl_mux_ops*)
 		of_match_device(at91_pinctrl_of_match, &pdev->dev)->data;
 	at91_pinctrl_child_count(info, np);
 
@@ -1403,7 +1403,7 @@ static int __devinit at91_gpio_probe(struct platform_device *pdev)
 		goto err;
 	}
 
-	at91_chip->ops =
+	at91_chip->ops = (struct at91_pinctrl_mux_ops*)
 		of_match_device(at91_gpio_of_match, &pdev->dev)->data;
 	at91_chip->pioc_virq = irq;
 	at91_chip->pioc_idx = alias_idx;