projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-3.8-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
base
/
dma-mapping.c
diff --git
a/drivers/base/dma-mapping.c
b/drivers/base/dma-mapping.c
index 3fbedc75e7c56219d1f0eafeabdebe9e058edc27..0ce39a33b3c2c2faf23746f662d609f22c7cf46b 100644
(file)
--- a/
drivers/base/dma-mapping.c
+++ b/
drivers/base/dma-mapping.c
@@
-218,6
+218,8
@@
void dmam_release_declared_memory(struct device *dev)
}
EXPORT_SYMBOL(dmam_release_declared_memory);
+#endif
+
/*
* Create scatter-list for the already allocated DMA buffer.
*/
@@
-236,8
+238,6
@@
int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
}
EXPORT_SYMBOL(dma_common_get_sgtable);
-#endif
-
/*
* Create userspace mapping for the DMA-coherent memory.
*/