openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'imx/pinctrl' into next/pinctrl 

* imx/pinctrl:
  mtd: nand: gpmi: fix compile error caused by pinctrl call
This commit is contained in:
Olof Johansson 2012-05-19 08:00:41 -07:00
parent cbd8d84231 3e48b1baa0
commit f3f08dcb99
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/nand/gpmi-nand/gpmi-nand.c
View File

@ -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;