Changeset 12d7710 in mainline for kernel/generic/include/mm/as.h

Timestamp:

2010-03-26T22:01:28Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1faa995

Parents:

4204ad9 (diff), eaf22d4 (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/generic/include/mm/as.h (modified) (2 diffs)

kernel/generic/include/mm/as.h

@@ -37 +37 @@
 
 #ifdef KERNEL
-#include <arch/types.h>
+        #include <typedefs.h>
 #else
-#include <sys/types.h>
+        #include <sys/types.h>
 #endif
 
@@ -65 +65 @@
 #include <arch/mm/as.h>
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>