git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
pinctrl
/
pinctrl-imx35.c
diff --git
a/drivers/pinctrl/pinctrl-imx35.c
b/drivers/pinctrl/pinctrl-imx35.c
index
1dbf527
..
6e21411
100644
(file)
--- a/
drivers/pinctrl/pinctrl-imx35.c
+++ b/
drivers/pinctrl/pinctrl-imx35.c
@@
-1564,7
+1564,7
@@
static struct of_device_id imx35_pinctrl_of_match[] = {
{ /* sentinel */ }
};
-static int
__devinit
imx35_pinctrl_probe(struct platform_device *pdev)
+static int imx35_pinctrl_probe(struct platform_device *pdev)
{
return imx_pinctrl_probe(pdev, &imx35_pinctrl_info);
}