Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-u300/timer.c between commit 38ff87f77af0 ("sched_clock:
Make ARM's sched_clock generic for all architectures") from the tip tree
and commit 3c96d8ea8101 ("ARM: u300: enable delaytimer on the U300") from
the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-u300/timer.c
index af771b7,390ae5f..0000000
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@@ -18,12 -18,12 +18,12 @@@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/irq.h>
+#include <linux/sched_clock.h>
-
- #include <mach/hardware.h>
- #include <mach/irqs.h>
+ #include <linux/delay.h>
+ #include <linux/of_address.h>
+ #include <linux/of_irq.h>
/* Generic stuff */
-#include <asm/sched_clock.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
Attachment:
pgpRycVu16Ety.pgp
Description: PGP signature
