summaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-stmp3xxx.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-21 16:10:36 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-21 16:10:42 +1100
commit846bb7788aced3ff6bfb5f674899ee5bc783e98e (patch)
treea19c658572beb8963dabe962f626265845b5d6b2 /drivers/rtc/rtc-stmp3xxx.c
parent8cc156311126614ff6a59560e4eb20731156f799 (diff)
parentda691fd2697453e910a4bd0c8daaa80da48a0935 (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/rtc/rtc-stmp3xxx.c')
-rw-r--r--drivers/rtc/rtc-stmp3xxx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
index cc9a9b652b13..98f0d3c30738 100644
--- a/drivers/rtc/rtc-stmp3xxx.c
+++ b/drivers/rtc/rtc-stmp3xxx.c
@@ -26,6 +26,7 @@
#include <linux/rtc.h>
#include <linux/slab.h>
#include <linux/of_device.h>
+#include <linux/of.h>
#include <linux/stmp_device.h>
#include <linux/stmp3xxx_rtc_wdt.h>
@@ -344,7 +345,7 @@ static struct platform_driver stmp3xxx_rtcdrv = {
.driver = {
.name = "stmp3xxx-rtc",
.owner = THIS_MODULE,
- .of_match_table = rtc_dt_ids,
+ .of_match_table = of_match_ptr(rtc_dt_ids),
},
};