From c980cdd0aadc6ab781511bf18107a18879a8af38 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Thu, 11 Jan 2007 14:08:44 +0000
Subject: [PATCH] Move memmap.h out of arch/i386; it no longer contains
 anything architecture-dependent and is needed by the ELF code.

---
 src/arch/i386/core/relocate.c                    | 2 +-
 src/arch/i386/firmware/pcbios/memmap.c           | 2 +-
 src/{arch/i386/include => include/gpxe}/memmap.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{arch/i386/include => include/gpxe}/memmap.h (87%)

diff --git a/src/arch/i386/core/relocate.c b/src/arch/i386/core/relocate.c
index c9ac7ee1..d3b42d0d 100644
--- a/src/arch/i386/core/relocate.c
+++ b/src/arch/i386/core/relocate.c
@@ -1,6 +1,6 @@
 #include <io.h>
 #include <registers.h>
-#include <memmap.h>
+#include <gpxe/memmap.h>
 
 /*
  * Originally by Eric Biederman
diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c
index daa1d99c..6bbb22ac 100644
--- a/src/arch/i386/firmware/pcbios/memmap.c
+++ b/src/arch/i386/firmware/pcbios/memmap.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <realmode.h>
 #include <bios.h>
-#include <memmap.h>
+#include <gpxe/memmap.h>
 
 /**
  * @file
diff --git a/src/arch/i386/include/memmap.h b/src/include/gpxe/memmap.h
similarity index 87%
rename from src/arch/i386/include/memmap.h
rename to src/include/gpxe/memmap.h
index ccba14b6..836a1b92 100644
--- a/src/arch/i386/include/memmap.h
+++ b/src/include/gpxe/memmap.h
@@ -1,5 +1,5 @@
-#ifndef _MEMMAP_H
-#define _MEMMAP_H
+#ifndef _GPXE_MEMMAP_H
+#define _GPXE_MEMMAP_H
 
 #include <stdint.h>
 
@@ -31,4 +31,4 @@ struct memory_map {
 
 extern void get_memmap ( struct memory_map *memmap );
 
-#endif /* _MEMMAP_H */
+#endif /* _GPXE_MEMMAP_H */