Module: xenomai-head Branch: master Commit: 2fa93aa0da14896555faac8e3c732a67c2427c41 URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=2fa93aa0da14896555faac8e3c732a67c2427c41
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org> Date: Thu May 26 21:57:28 2011 +0200 arm: fix clocksoure/clockevents, take #2 --- include/asm-arm/hal.h | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/asm-arm/hal.h b/include/asm-arm/hal.h index 1f69a7a..ef7a8bb 100644 --- a/include/asm-arm/hal.h +++ b/include/asm-arm/hal.h @@ -58,15 +58,11 @@ #elif defined(CONFIG_ARCH_MXC) #define RTHAL_TIMER_DEVICE "mxc_timer1" #define RTHAL_CLOCK_DEVICE "mxc_timer1" -#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) -#define RTHAL_TIMER_DEVICE "gp timer" -#define RTHAL_CLOCK_DEVICE "gp timer" -#elif defined(CONFIG_ARCH_OMAP4) -#ifndef CONFIG_SMP +#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) \ + || (defined(CONFIG_ARCH_OMAP4) && !defined(CONFIG_SMP)) #define RTHAL_TIMER_DEVICE "gp timer" #define RTHAL_CLOCK_DEVICE "gp timer" /* omap4 SMP uses TWD */ -#endif #elif defined(CONFIG_PLAT_ORION) #define RTHAL_TIMER_DEVICE "orion_tick" #define RTHAL_CLOCK_DEVICE "orion_clocksource" _______________________________________________ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git
