summaryrefslogtreecommitdiff
path: root/src/arch/arm/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/arm/include')
-rw-r--r--src/arch/arm/include/armv4/arch/mmio.h (renamed from src/arch/arm/include/armv4/arch/io.h)7
-rw-r--r--src/arch/arm/include/armv7/arch/mmio.h (renamed from src/arch/arm/include/armv7/arch/io.h)7
2 files changed, 8 insertions, 6 deletions
diff --git a/src/arch/arm/include/armv4/arch/io.h b/src/arch/arm/include/armv4/arch/mmio.h
index 9597ffed1c..ad89ef5d12 100644
--- a/src/arch/arm/include/armv4/arch/io.h
+++ b/src/arch/arm/include/armv4/arch/mmio.h
@@ -25,8 +25,9 @@
* 12-Dec-1999 RMK More cleanups
* 18-Jun-2000 RMK Removed virt_to_* and friends definitions
*/
-#ifndef __ARCH_IO_H
-#define __ARCH_IO_H
+
+#ifndef __ARCH_MMIO_H__
+#define __ARCH_MMIO_H__
#include <endian.h>
#include <stdint.h>
@@ -61,4 +62,4 @@ static inline void write32(void *addr, uint32_t val)
*(volatile uint32_t *)addr = val;
}
-#endif /* __ARCH_IO_H */
+#endif /* __ARCH_MMIO_H__ */
diff --git a/src/arch/arm/include/armv7/arch/io.h b/src/arch/arm/include/armv7/arch/mmio.h
index 1772659fec..b245b264fd 100644
--- a/src/arch/arm/include/armv7/arch/io.h
+++ b/src/arch/arm/include/armv7/arch/mmio.h
@@ -25,8 +25,9 @@
* 12-Dec-1999 RMK More cleanups
* 18-Jun-2000 RMK Removed virt_to_* and friends definitions
*/
-#ifndef __ARCH_IO_H
-#define __ARCH_IO_H
+
+#ifndef __ARCH_MMIO_H__
+#define __ARCH_MMIO_H__
#include <arch/cache.h> /* for dmb() */
#include <endian.h>
@@ -71,4 +72,4 @@ static inline void write32(void *addr, uint32_t val)
dmb();
}
-#endif /* __ARCH_IO_H */
+#endif /* __ARCH_MMIO_H__ */