diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /include/asm-x86_64/e820.h | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-x86_64/e820.h')
| -rw-r--r-- | include/asm-x86_64/e820.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86_64/e820.h b/include/asm-x86_64/e820.h index 93b51df51687..670a3388e70a 100644 --- a/include/asm-x86_64/e820.h +++ b/include/asm-x86_64/e820.h | |||
| @@ -59,6 +59,8 @@ extern void __init parse_memopt(char *p, char **end); | |||
| 59 | extern void __init parse_memmapopt(char *p, char **end); | 59 | extern void __init parse_memmapopt(char *p, char **end); |
| 60 | 60 | ||
| 61 | extern struct e820map e820; | 61 | extern struct e820map e820; |
| 62 | |||
| 63 | extern unsigned ebda_addr, ebda_size; | ||
| 62 | #endif/*!__ASSEMBLY__*/ | 64 | #endif/*!__ASSEMBLY__*/ |
| 63 | 65 | ||
| 64 | #endif/*__E820_HEADER*/ | 66 | #endif/*__E820_HEADER*/ |