Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/include/asm/timex.h between commit 56942fec06ef ("ARM: 7538/1: delay: add registration mechanism for delay timer sources") from the arm tree and commit 387798b37c8d ("ARM: initial multiplatform support") 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/include/asm/timex.h index 9acc135,963342a..0000000 --- a/arch/arm/include/asm/timex.h +++ b/arch/arm/include/asm/timex.h @@@ -12,9 -12,19 +12,13 @@@ #ifndef _ASMARM_TIMEX_H #define _ASMARM_TIMEX_H -#include <asm/arch_timer.h> + #ifdef CONFIG_ARCH_MULTIPLATFORM + #define CLOCK_TICK_RATE 1000000 + #else #include <mach/timex.h> + #endif typedef unsigned long cycles_t; - -#ifdef ARCH_HAS_READ_CURRENT_TIMER #define get_cycles() ({ cycles_t c; read_current_timer(&c) ? 0 : c; }) -#else -#define get_cycles() (0) -#endif #endif
Attachment:
pgpG72MvO4ia9.pgp
Description: PGP signature