Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / x86 / include / asm / e820.h

diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
index 21bc63339e1fe731703e56958ae120ad554d6a2d..9d29f82f9728e817d3a683e2d7811a8bf3ba4fb4 100644 (file)
--- a/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
@@ -12,7 +12,7 @@
 #ifndef __ASSEMBLY__
 #include <linux/types.h>
 
-struct e820entry {
+struct e820_entry {
        __u64 addr;     /* start of memory segment */
        __u64 size;     /* size of memory segment */
        __u32 type;     /* type of memory segment */
@@ -23,4 +23,8 @@ struct e820entry {
 
 #endif /* __ASSEMBLY__ */
 
+/* Implementation defined function to install an e820 map */
+unsigned int install_e820_map(unsigned int max_entries,
+                             struct e820_entry *);
+
 #endif /* _ASM_X86_E820_H */