From f238de5d39c847518403f116c3d2949a070e0266 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 10 Sep 2013 17:04:55 +0000
Subject: [PATCH] git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6290
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/nil/ports/ARMCMx/nilcore.h     | 6 ++++++
 os/nil/ports/ARMCMx/nilcore_v6m.h | 4 ----
 os/nil/ports/ARMCMx/nilcore_v7m.h | 4 ----
 os/rt/ports/ARMCMx/chcore.h       | 6 ++++++
 os/rt/ports/ARMCMx/chcore_v6m.h   | 4 ----
 os/rt/ports/ARMCMx/chcore_v7m.h   | 4 ----
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/os/nil/ports/ARMCMx/nilcore.h b/os/nil/ports/ARMCMx/nilcore.h
index 9a31f5c87..a4d032b95 100644
--- a/os/nil/ports/ARMCMx/nilcore.h
+++ b/os/nil/ports/ARMCMx/nilcore.h
@@ -196,6 +196,12 @@ struct port_intctx {};
 #include "nilcore_v7m.h"
 #endif
 
+#if !defined(_FROM_ASM_)
+#if NIL_CFG_TIMEDELTA > 0
+#include "nilcore_timer.h"
+#endif
+#endif /* !defined(_FROM_ASM_) */
+
 #endif /* _NILCORE_H_ */
 
 /** @} */
diff --git a/os/nil/ports/ARMCMx/nilcore_v6m.h b/os/nil/ports/ARMCMx/nilcore_v6m.h
index 159ce9989..38b360781 100644
--- a/os/nil/ports/ARMCMx/nilcore_v6m.h
+++ b/os/nil/ports/ARMCMx/nilcore_v6m.h
@@ -275,10 +275,6 @@ extern "C" {
 }
 #endif
 
-#if NIL_CFG_TIMEDELTA > 0
-#include "nilcore_timer.h"
-#endif
-
 /*===========================================================================*/
 /* Module inline functions.                                                  */
 /*===========================================================================*/
diff --git a/os/nil/ports/ARMCMx/nilcore_v7m.h b/os/nil/ports/ARMCMx/nilcore_v7m.h
index 0bc4fdf05..256f09f6d 100644
--- a/os/nil/ports/ARMCMx/nilcore_v7m.h
+++ b/os/nil/ports/ARMCMx/nilcore_v7m.h
@@ -372,10 +372,6 @@ extern "C" {
 }
 #endif
 
-#if NIL_CFG_TIMEDELTA > 0
-#include "nilcore_timer.h"
-#endif
-
 /*===========================================================================*/
 /* Module inline functions.                                                  */
 /*===========================================================================*/
diff --git a/os/rt/ports/ARMCMx/chcore.h b/os/rt/ports/ARMCMx/chcore.h
index c2eb68078..9274b6d1d 100644
--- a/os/rt/ports/ARMCMx/chcore.h
+++ b/os/rt/ports/ARMCMx/chcore.h
@@ -196,6 +196,12 @@ struct port_intctx {};
 #include "chcore_v7m.h"
 #endif
 
+#if !defined(_FROM_ASM_)
+#if CH_CFG_TIMEDELTA > 0
+#include "chcore_timer.h"
+#endif
+#endif /* !defined(_FROM_ASM_) */
+
 #endif /* _CHCORE_H_ */
 
 /** @} */
diff --git a/os/rt/ports/ARMCMx/chcore_v6m.h b/os/rt/ports/ARMCMx/chcore_v6m.h
index fc53c0202..7cba6df34 100644
--- a/os/rt/ports/ARMCMx/chcore_v6m.h
+++ b/os/rt/ports/ARMCMx/chcore_v6m.h
@@ -286,10 +286,6 @@ extern "C" {
 }
 #endif
 
-#if CH_CFG_TIMEDELTA > 0
-#include "chcore_timer.h"
-#endif
-
 /*===========================================================================*/
 /* Module inline functions.                                                  */
 /*===========================================================================*/
diff --git a/os/rt/ports/ARMCMx/chcore_v7m.h b/os/rt/ports/ARMCMx/chcore_v7m.h
index c802a980d..3c5947557 100644
--- a/os/rt/ports/ARMCMx/chcore_v7m.h
+++ b/os/rt/ports/ARMCMx/chcore_v7m.h
@@ -383,10 +383,6 @@ extern "C" {
 }
 #endif
 
-#if CH_CFG_TIMEDELTA > 0
-#include "chcore_timer.h"
-#endif
-
 /*===========================================================================*/
 /* Module inline functions.                                                  */
 /*===========================================================================*/