diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-20 17:04:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-20 17:26:35 +1100 |
| commit | 3baf68f92a57e6f09cff20194dbdfa2bdc4ea690 (patch) | |
| tree | e457ad4ecd61664fcbc5faf3bb76169ff868292f /drivers/rtc/rtc-stmp3xxx.c | |
| parent | 9cfef73307b0568cfbaff137ccb2a1febb174d05 (diff) | |
| parent | b38448e0fa6ae60a8444af9327f47ad6136d5429 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/rtc/rtc-stmp3xxx.c')
| -rw-r--r-- | drivers/rtc/rtc-stmp3xxx.c | 3 |
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), }, }; |