Changeset 95c675b in mainline for kernel/arch/arm32/include/arch/cp15.h

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• kernel/arch/arm32/include/arch/cp15.h (modified) (1 diff)

kernel/arch/arm32/include/arch/cp15.h

@@ -37 +37 @@
 #define KERN_arm32_CP15_H_
 
-#if defined(KERNEL) || defined(BOOT)
-#include <typedefs.h>
-#else
 #include <stdint.h>
-#endif
 
 /** See ARM Architecture reference manual ch. B3.17.1 page B3-1456