commit f3f08dcb9965f42378851ce888fb7539607712e6
author Olof Johansson <olof@lixom.net> Sat May 19 08:00:41 2012 -0700
committer Olof Johansson <olof@lixom.net> Sat May 19 08:00:41 2012 -0700
tree 9fd6f0060757ca354c97d69a1719ba2f4d7c3953
parent cbd8d842319c8084c050292e7d167be2a4cf1ad9
parent 3e48b1baa042a4d5e92f373fc945a4aa0081178b

Merge branch 'imx/pinctrl' into next/pinctrl

* imx/pinctrl:
  mtd: nand: gpmi: fix compile error caused by pinctrl call

drivers/mtd/nand/gpmi-nand/gpmi-nand.c

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 8478fd9..b68e043 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -496,7 +496,7 @@
 	if (ret)
 		goto exit_dma_channels;
 
-	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+	pinctrl = devm_pinctrl_get_select_default(&this->pdev->dev);
 	if (IS_ERR(pinctrl)) {
 		ret = PTR_ERR(pinctrl);
 		goto exit_pin;