Merge branch 'imx/pinctrl' into next/pinctrl

* imx/pinctrl: mtd: nand: gpmi: fix compile error caused by pinctrl call
git-mirror · May 19, 2012 · f3f08dc · f3f08dc
2 parents cbd8d84 + 3e48b1b
commit f3f08dc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -496,7 +496,7 @@ static int __devinit acquire_resources(struct gpmi_nand_data *this)
 	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;