From 24f5ec929c9f60319fd9b5ea0fe461233ae08f08 Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Sat, 15 Feb 2014 18:49:27 +0100
Subject: [PATCH] removed duplicate inISR prototype

---
 core/hwtimer.c        | 1 +
 core/include/irq.h    | 4 ++--
 core/include/kernel.h | 8 --------
 core/sched.c          | 1 +
 core/thread.c         | 1 +
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/core/hwtimer.c b/core/hwtimer.c
index 2ed9597aa3..b9d3b12cc7 100644
--- a/core/hwtimer.c
+++ b/core/hwtimer.c
@@ -27,6 +27,7 @@
 #include "thread.h"
 #include "lifo.h"
 #include "mutex.h"
+#include "irq.h"
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"
diff --git a/core/include/irq.h b/core/include/irq.h
index 82f4fe79ac..953fec1950 100644
--- a/core/include/irq.h
+++ b/core/include/irq.h
@@ -52,8 +52,8 @@ unsigned enableIRQ(void);
 void restoreIRQ(unsigned state);
 
 /**
- * @brief   Checks if the mcu is currently processing an interrupt.
- * @return  true, if in interrupt service routine
+ * @brief   Check whether called from interrupt service routine
+ * @return  true, if in interrupt service routine, false if not
  */
 int inISR(void);
 
diff --git a/core/include/kernel.h b/core/include/kernel.h
index eea0717243..423a432de2 100644
--- a/core/include/kernel.h
+++ b/core/include/kernel.h
@@ -75,14 +75,6 @@
 #define PRIORITY_IDLE           PRIORITY_MIN
 #define PRIORITY_MAIN           (PRIORITY_MIN - (SCHED_PRIO_LEVELS/2))
 
-/**
- * @brief   Check whether called from interrupt service routine
- *
- * @return  true if called from within interrupt
- * @return  false if not.
- */
-int inISR(void);
-
 #define LPM_PREVENT_SLEEP_UART    BIT2
 #define LPM_PREVENT_SLEEP_HWTIMER    BIT1
 
diff --git a/core/sched.c b/core/sched.c
index 09102e23c7..90556603cb 100644
--- a/core/sched.c
+++ b/core/sched.c
@@ -28,6 +28,7 @@
 #include "clist.h"
 #include "bitarithm.h"
 #include "thread.h"
+#include "irq.h"
 
 #if SCHEDSTATISTICS
 #include "hwtimer.h"
diff --git a/core/thread.c b/core/thread.c
index bec8df88ca..3680810665 100644
--- a/core/thread.c
+++ b/core/thread.c
@@ -23,6 +23,7 @@
 
 #include "thread.h"
 #include "kernel.h"
+#include "irq.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"