From c48600d33e2d4a81da5dedebb36460b303057915 Mon Sep 17 00:00:00 2001
From: Ralph Siemsen <ralphs@netwinder.org>
Date: Mon, 18 Sep 2006 16:28:50 +0100
Subject: [PATCH] --- yaml --- r: 33955 b: refs/heads/master c:
 e40b1074af46d53740320f88dfffd9fb2f78bdf3 h: refs/heads/master i:   33953:
 570850509159c426c12dcbd8f6b62b1c0e58b433   33951:
 4aae9354a68bb31caf4b8f443b71e2bca2008e55 v: v3

---
 [refs]                       | 2 +-
 trunk/include/asm-arm/elf.h  | 2 ++
 trunk/include/asm-arm/page.h | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b5412755b7a7..316d6a33e4ed 100644
--- 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
index 71061ca5c5d0..ae7baa6c73f7 100644
--- 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
index 63d12f0244c5..b721270b9986 100644
--- 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