Messages in this thread | | | Date | Sun, 3 Feb 2013 00:01:12 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with the watchdog tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in drivers/rtc/rtc-stmp3xxx.c between commit e02f5cf6b648 ("rtc: stmp3xxx: add wdt-accessor function") from the watchdog tree and commit "drivers/rtc: use of_match_ptr() macro" from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/rtc/rtc-stmp3xxx.c index cc9a9b6,b2a8ed9..0000000 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c @@@ -26,8 -26,7 +26,9 @@@ #include <linux/rtc.h> #include <linux/slab.h> #include <linux/of_device.h> +#include <linux/stmp_device.h> +#include <linux/stmp3xxx_rtc_wdt.h> + #include <linux/of.h> #include <mach/common.h> [unhandled content-type:application/pgp-signature] | |