projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-omap.c
diff --git
a/drivers/rtc/rtc-omap.c
b/drivers/rtc/rtc-omap.c
index c7d97ee59327a7bec079b7ab452fdbbb45728b56..26de5f8c2ae43379811f47cc39dd23d9ed40924d 100644
(file)
--- a/
drivers/rtc/rtc-omap.c
+++ b/
drivers/rtc/rtc-omap.c
@@
-553,7
+553,7
@@
static struct platform_driver omap_rtc_driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
.pm = &omap_rtc_pm_ops,
- .of_match_table = o
f_match_ptr(omap_rtc_of_match)
,
+ .of_match_table = o
map_rtc_of_match
,
},
.id_table = omap_rtc_devtype,
};