summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/e820.h
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-02-03 19:38:41 +0300
committerFelix Blyakher <felixb@sgi.com>2009-02-03 19:38:41 +0300
commit6d2160bfe7826aca1c94b4bca77093908a452ae7 (patch)
tree8153fcd8a7c467e5de136f312e8ef5b27bea9d6b /arch/x86/include/asm/e820.h
parentf0e0059b9c18426cffdcc04161062251a8f9741e (diff)
parentb1792e367053968f2ddb48bc911d314143ce6242 (diff)
downloadlinux-6d2160bfe7826aca1c94b4bca77093908a452ae7.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/x86/include/asm/e820.h')
-rw-r--r--arch/x86/include/asm/e820.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
index 3d8ceddbd407..00d41ce4c844 100644
--- a/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
@@ -49,6 +49,7 @@
#define E820_RESERVED_KERN 128
#ifndef __ASSEMBLY__
+#include <linux/types.h>
struct e820entry {
__u64 addr; /* start of memory segment */
__u64 size; /* size of memory segment */