diff --git a/[refs] b/[refs]
index 5aa264b05474..ee752d30764b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47dbec59c37ab02946a6db7ac30c3bf6ca02630c
+refs/heads/master: 8c6871979d903b8b0e4cd78a59d84afc262611bf
diff --git a/trunk/drivers/pinctrl/pinctrl-bcm2835.c b/trunk/drivers/pinctrl/pinctrl-bcm2835.c
index a4adee633fa9..3e0cc0ddb418 100644
--- a/trunk/drivers/pinctrl/pinctrl-bcm2835.c
+++ b/trunk/drivers/pinctrl/pinctrl-bcm2835.c
@@ -960,7 +960,7 @@ static int __devinit bcm2835_pinctrl_probe(struct platform_device *pdev)
 		return err;
 	}
 
-	pc->base = devm_request_and_ioremap(&pdev->dev, &iomem);
+	pc->base = devm_request_and_ioremap(dev, &iomem);
 	if (!pc->base)
 		return -EADDRNOTAVAIL;