diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 14:34:47 -0600 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 14:34:47 -0600 |
| commit | 0a0fc0ddbe732779366ab6b1b879f62195e65967 (patch) | |
| tree | 7b42490a676cf39ae0691b6859ecf7fd410f229b /include/asm-x86_64/e820.h | |
| parent | 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a (diff) | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
| download | kernel-crypto-0a0fc0ddbe732779366ab6b1b879f62195e65967.tar.gz kernel-crypto-0a0fc0ddbe732779366ab6b1b879f62195e65967.tar.xz kernel-crypto-0a0fc0ddbe732779366ab6b1b879f62195e65967.zip | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'include/asm-x86_64/e820.h')
| -rw-r--r-- | include/asm-x86_64/e820.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86_64/e820.h b/include/asm-x86_64/e820.h index e682edc24a6..8dcc3266524 100644 --- a/include/asm-x86_64/e820.h +++ b/include/asm-x86_64/e820.h @@ -55,6 +55,7 @@ extern unsigned long e820_hole_size(unsigned long start_pfn, unsigned long end_pfn); extern void __init parse_memopt(char *p, char **end); +extern void __init parse_memmapopt(char *p, char **end); extern struct e820map e820; #endif/*!__ASSEMBLY__*/ |