diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
| commit | e152f18027552eb34006b35347e72bc805783027 (patch) | |
| tree | ac9765e68597c08c24de447f46bb3e04d9881e1b /drivers/pinctrl/pinctrl-imx28.c | |
| parent | 49ba4f94bddb7f5272c4596d505f94355cc3fbd2 (diff) | |
| parent | 42c364ace52ae6b4699105b39f2559c256b6cd4c (diff) | |
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser
branch.
Diffstat (limited to 'drivers/pinctrl/pinctrl-imx28.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-imx28.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-imx28.c b/drivers/pinctrl/pinctrl-imx28.c index e1af2ba89004..79c9c8d296af 100644 --- a/drivers/pinctrl/pinctrl-imx28.c +++ b/drivers/pinctrl/pinctrl-imx28.c @@ -383,7 +383,7 @@ static struct mxs_pinctrl_soc_data imx28_pinctrl_data = { .npins = ARRAY_SIZE(imx28_pins), }; -static int __devinit imx28_pinctrl_probe(struct platform_device *pdev) +static int imx28_pinctrl_probe(struct platform_device *pdev) { return mxs_pinctrl_probe(pdev, &imx28_pinctrl_data); } |