Messages in this thread | | | Date | Thu, 11 Apr 2013 14:08:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the pm tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in include/linux/clockchips.h between commit 4dbad816febb ("timer: move enum definition out of ifdef section") from the pm tree and commit 19919226c3f2 ("clockevents: Add missing tick_check_broadcast_expired() for CLOCKEVENTS=n") from the tip 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 include/linux/clockchips.h index f9fd937,464e229..0000000 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@@ -181,7 -192,8 +192,8 @@@ static inline void clockevents_notify(u static inline void clockevents_suspend(void) {} static inline void clockevents_resume(void) {} -#define clockevents_notify(reason, arg) do { } while (0) +static inline void clockevents_notify(unsigned long reason, void *arg) {} + static inline int tick_check_broadcast_expired(void) { return 0; } #endif [unhandled content-type:application/pgp-signature] | |