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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
init_64.c
diff --git
a/arch/x86/mm/init_64.c
b/arch/x86/mm/init_64.c
index
8434620
..
71a5929
100644
(file)
--- a/
arch/x86/mm/init_64.c
+++ b/
arch/x86/mm/init_64.c
@@
-51,7
+51,6
@@
#include <asm/numa.h>
#include <asm/cacheflush.h>
#include <asm/init.h>
-#include <linux/bootmem.h>
static int __init parse_direct_gbpages_off(char *arg)
{