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-pxa168.c
diff --git
a/drivers/pinctrl/pinctrl-pxa168.c
b/drivers/pinctrl/pinctrl-pxa168.c
index
cb771e4
..
d9cd2b4
100644
(file)
--- a/
drivers/pinctrl/pinctrl-pxa168.c
+++ b/
drivers/pinctrl/pinctrl-pxa168.c
@@
-615,7
+615,7
@@
static struct pxa3xx_pinmux_info pxa168_info = {
.ds_shift = PXA168_DS_SHIFT,
};
-static int
__devinit
pxa168_pinmux_probe(struct platform_device *pdev)
+static int pxa168_pinmux_probe(struct platform_device *pdev)
{
return pxa3xx_pinctrl_register(pdev, &pxa168_info);
}