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
dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h>
[sfrench/cifs-2.6.git]
/
arch
/
microblaze
/
mm
/
init.c
diff --git
a/arch/microblaze/mm/init.c
b/arch/microblaze/mm/init.c
index 3344d4a1fe890c9af7fbb8ba62aaad4ac6d797a0..7659a8b86580fd43f23882ccfc990cebb53eb7af 100644
(file)
--- a/
arch/microblaze/mm/init.c
+++ b/
arch/microblaze/mm/init.c
@@
-7,7
+7,7
@@
* for more details.
*/
-#include <linux/dma-
contiguou
s.h>
+#include <linux/dma-
map-op
s.h>
#include <linux/memblock.h>
#include <linux/init.h>
#include <linux/kernel.h>