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 branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-isl12057.c
diff --git
a/drivers/rtc/rtc-isl12057.c
b/drivers/rtc/rtc-isl12057.c
index b8f862953f7f8331fca38d53949ff2b8bd5c6fbd..da818d3337cec5d2bd552ac046286763fbf4a1fa 100644
(file)
--- a/
drivers/rtc/rtc-isl12057.c
+++ b/
drivers/rtc/rtc-isl12057.c
@@
-644,7
+644,8
@@
static SIMPLE_DEV_PM_OPS(isl12057_rtc_pm_ops, isl12057_rtc_suspend,
#ifdef CONFIG_OF
static const struct of_device_id isl12057_dt_match[] = {
- { .compatible = "isl,isl12057" },
+ { .compatible = "isl,isl12057" }, /* for backward compat., don't use */
+ { .compatible = "isil,isl12057" },
{ },
};
#endif