aboutsummaryrefslogtreecommitdiffstats
path: root/os/kernel
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-27 09:00:47 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-27 09:00:47 +0000
commit972c852b2c5c1a235f743e4faf39af7a37f7368f (patch)
treed6a0b1e276232aa9e95a74343b64eb85b5df9ebe /os/kernel
parentf429108707622eb393338cdc56694cc672fb2f93 (diff)
downloadChibiOS-972c852b2c5c1a235f743e4faf39af7a37f7368f.tar.gz
ChibiOS-972c852b2c5c1a235f743e4faf39af7a37f7368f.tar.bz2
ChibiOS-972c852b2c5c1a235f743e4faf39af7a37f7368f.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1681 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel')
-rw-r--r--os/kernel/include/ch.h2
-rw-r--r--os/kernel/include/chinline.h (renamed from os/kernel/include/inline.h)0
2 files changed, 1 insertions, 1 deletions
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 607c96fe9..4fec9fbfe 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -83,7 +83,7 @@
#include "chmempools.h"
#include "chthreads.h"
#include "chregistry.h"
-#include "inline.h"
+#include "chinline.h"
#include "chqueues.h"
#include "chstreams.h"
#include "chioch.h"
diff --git a/os/kernel/include/inline.h b/os/kernel/include/chinline.h
index c70040d55..c70040d55 100644
--- a/os/kernel/include/inline.h
+++ b/os/kernel/include/chinline.h