diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
| commit | b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9 (patch) | |
| tree | 9847508d9b8d4e585f90db4a453bfbc3700c997e /arch/x86/include/asm/e820.h | |
| parent | a16fffdd8eb95ebab7dc22414896fe6493951e0e (diff) | |
| parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
Diffstat (limited to 'arch/x86/include/asm/e820.h')
| -rw-r--r-- | arch/x86/include/asm/e820.h | 1 |
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 @@ | |||
| 49 | #define E820_RESERVED_KERN 128 | 49 | #define E820_RESERVED_KERN 128 |
| 50 | 50 | ||
| 51 | #ifndef __ASSEMBLY__ | 51 | #ifndef __ASSEMBLY__ |
| 52 | #include <linux/types.h> | ||
| 52 | struct e820entry { | 53 | struct e820entry { |
| 53 | __u64 addr; /* start of memory segment */ | 54 | __u64 addr; /* start of memory segment */ |
| 54 | __u64 size; /* size of memory segment */ | 55 | __u64 size; /* size of memory segment */ |