projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...
[linux-2.6-microblaze.git]
/
kernel
/
dma
/
remap.c
diff --git
a/kernel/dma/remap.c
b/kernel/dma/remap.c
index
78b23f0
..
905c3fa
100644
(file)
--- a/
kernel/dma/remap.c
+++ b/
kernel/dma/remap.c
@@
-2,7
+2,7
@@
/*
* Copyright (c) 2014 The Linux Foundation
*/
-#include <linux/dma-map
ping
.h>
+#include <linux/dma-map
-ops
.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>