projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath
[cascardo/linux.git]
/
drivers
/
pinctrl
/
pinctrl-imx6q.c
diff --git
a/drivers/pinctrl/pinctrl-imx6q.c
b/drivers/pinctrl/pinctrl-imx6q.c
index
76dd9c4
..
8eb5ac1
100644
(file)
--- a/
drivers/pinctrl/pinctrl-imx6q.c
+++ b/
drivers/pinctrl/pinctrl-imx6q.c
@@
-480,7
+480,7
@@
static struct platform_driver imx6q_pinctrl_driver = {
.driver = {
.name = "imx6q-pinctrl",
.owner = THIS_MODULE,
- .of_match_table =
of_match_ptr(imx6q_pinctrl_of_match)
,
+ .of_match_table =
imx6q_pinctrl_of_match
,
},
.probe = imx6q_pinctrl_probe,
.remove = imx_pinctrl_remove,