projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[linux-2.6-block.git]
/
arch
/
h8300
/
mm
/
init.c
diff --git
a/arch/h8300/mm/init.c
b/arch/h8300/mm/init.c
index 9942f24aff9e19067a5b74ae05bb3ae26dfdb119..7cc3380f250cc608ea8815472a5652d2b1b04c3b 100644
(file)
--- a/
arch/h8300/mm/init.c
+++ b/
arch/h8300/mm/init.c
@@
-30,7
+30,7
@@
#include <linux/highmem.h>
#include <linux/pagemap.h>
#include <linux/bootmem.h>
-#include <linux/
slab
.h>
+#include <linux/
gfp
.h>
#include <asm/setup.h>
#include <asm/segment.h>