---

yaml --- r: 33955 b: refs/heads/master c: e40b107 h: refs/heads/master i: 33953: 5708505 33951: 4aae935 v: v3
git-mirror · Sep 18, 2006 · c48600d · c48600d
1 parent 52ba7f4
commit c48600d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9c3685b2f0515bffd8d13ea9e3417664ff22a07
+refs/heads/master: e40b1074af46d53740320f88dfffd9fb2f78bdf3
diff --git a/trunk/include/asm-arm/elf.h b/trunk/include/asm-arm/elf.h
@@ -8,7 +8,9 @@
 
 #include <asm/ptrace.h>
 #include <asm/user.h>
+#ifdef __KERNEL
 #include <asm/procinfo.h>
+#endif
 
 typedef unsigned long elf_greg_t;
 typedef unsigned long elf_freg_t[3];

diff --git a/trunk/include/asm-arm/page.h b/trunk/include/asm-arm/page.h
@@ -193,8 +193,8 @@ extern pmd_t *top_pmd;
 #define ARCH_SLAB_MINALIGN 8
 #endif
 
-#endif /* __KERNEL__ */
-
 #include <asm-generic/page.h>
 
+#endif /* __KERNEL__ */
+
 #endif