Changeset 46c20c8 in mainline for kernel/arch/abs32le/include/mm/frame.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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 changes.

File:

• kernel/arch/abs32le/include/mm/frame.h (modified) (1 diff)

kernel/arch/abs32le/include/mm/frame.h

@@ -40 +40 @@
 
 #ifdef KERNEL
-#ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern void frame_arch_init(void);
 extern void physmem_print(void);
 
-#endif /* __ASM__ */
 #endif /* KERNEL */