git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linux-2.6-watchdog-mm
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
e820.c
diff --git
a/arch/i386/kernel/e820.c
b/arch/i386/kernel/e820.c
index
2f7d0a9
..
f391abc
100644
(file)
--- a/
arch/i386/kernel/e820.c
+++ b/
arch/i386/kernel/e820.c
@@
-668,7
+668,7
@@
void __init register_bootmem_low_pages(unsigned long max_low_pfn)
}
}
-void __init register_memory(void)
+void __init
e820_
register_memory(void)
{
unsigned long gapstart, gapsize, round;
unsigned long long last;