aboutsummaryrefslogtreecommitdiffstats
path: root/os/common/ports/ARMCMx/mpu.h
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-01-08 09:12:47 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-01-08 09:12:47 +0000
commitfbc0d4b082178ac1018586f0efa0f3f4160355f8 (patch)
tree9af8cf74677c544167667264c5ad7ce955fc6d90 /os/common/ports/ARMCMx/mpu.h
parent7761387ba0a0ac206b7e5ab133462c29882b63bd (diff)
downloadChibiOS-fbc0d4b082178ac1018586f0efa0f3f4160355f8.tar.gz
ChibiOS-fbc0d4b082178ac1018586f0efa0f3f4160355f8.tar.bz2
ChibiOS-fbc0d4b082178ac1018586f0efa0f3f4160355f8.zip
Unified MPU handler.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11234 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common/ports/ARMCMx/mpu.h')
-rw-r--r--os/common/ports/ARMCMx/mpu.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/os/common/ports/ARMCMx/mpu.h b/os/common/ports/ARMCMx/mpu.h
index 6de5c5c50..30eff0e30 100644
--- a/os/common/ports/ARMCMx/mpu.h
+++ b/os/common/ports/ARMCMx/mpu.h
@@ -25,6 +25,10 @@
#ifndef MPU_H
#define MPU_H
+/* Other layers may include another header named mpu_v7m.h which is perfectly
+ compatible, doing a check here to avoid name conflicts.*/
+#ifndef MPUV7M_H
+
/*===========================================================================*/
/* Driver constants. */
/*===========================================================================*/
@@ -203,6 +207,8 @@ extern "C" {
}
#endif
+#endif /* MPUV7M_H */
+
#endif /* MPU_H */
/** @} */