From e7c036a589c19e6f1f87188b3d4a49c0da73bb57 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 15 Jul 2008 15:02:27 +1000
Subject: [PATCH] --- yaml --- r: 102322 b: refs/heads/master c:
 2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/asm-x86/e820.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e946e4f91c8a..455be9223aeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9354094a95aed456a46b353b1051a7e2fab29045
+refs/heads/master: 2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c
diff --git a/trunk/include/asm-x86/e820.h b/trunk/include/asm-x86/e820.h
index 33e793e991d0..06633b01dd5b 100644
--- a/trunk/include/asm-x86/e820.h
+++ b/trunk/include/asm-x86/e820.h
@@ -59,6 +59,7 @@ struct e820map {
 	struct e820entry map[E820_X_MAX];
 };
 
+#ifdef __KERNEL__
 /* see comment in arch/x86/kernel/e820.c */
 extern struct e820map e820;
 extern struct e820map e820_saved;
@@ -115,7 +116,7 @@ extern void setup_memory_map(void);
 extern char *default_machine_specific_memory_setup(void);
 extern char *machine_specific_memory_setup(void);
 extern char *memory_setup(void);
-
+#endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 
 #define ISA_START_ADDRESS	0xa0000