git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mm: remove include/linux/bootmem.h
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
cavium-octeon
/
dma-octeon.c
diff --git
a/arch/mips/cavium-octeon/dma-octeon.c
b/arch/mips/cavium-octeon/dma-octeon.c
index c44c1a654471832f5b8020111fc5337f8bc2fd09..e8eb60ed99f2a8f877b0cdf2bc673e1ee643f40b 100644
(file)
--- a/
arch/mips/cavium-octeon/dma-octeon.c
+++ b/
arch/mips/cavium-octeon/dma-octeon.c
@@
-11,7
+11,7
@@
* Copyright (C) 2010 Cavium Networks, Inc.
*/
#include <linux/dma-direct.h>
-#include <linux/
bootmem
.h>
+#include <linux/
memblock
.h>
#include <linux/swiotlb.h>
#include <linux/types.h>
#include <linux/init.h>