projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dm-3.14-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/device...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
pinctrl
/
pinctrl-capri.c
diff --git
a/drivers/pinctrl/pinctrl-capri.c
b/drivers/pinctrl/pinctrl-capri.c
index
4669c53
..
eb25002
100644
(file)
--- a/
drivers/pinctrl/pinctrl-capri.c
+++ b/
drivers/pinctrl/pinctrl-capri.c
@@
-1435,7
+1435,7
@@
int __init capri_pinctrl_probe(struct platform_device *pdev)
}
static struct of_device_id capri_pinctrl_of_match[] = {
}
static struct of_device_id capri_pinctrl_of_match[] = {
- { .compatible = "brcm,
capri
-pinctrl", },
+ { .compatible = "brcm,
bcm11351
-pinctrl", },
{ },
};
{ },
};