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
arm/arm64: dts: Fix remaining dtc 'unit_address_format' warnings
[linux-2.6-microblaze.git]
/
arch
/
x86
/
include
/
asm
/
dma-mapping.h
diff --git
a/arch/x86/include/asm/dma-mapping.h
b/arch/x86/include/asm/dma-mapping.h
index
fed67ea
..
bb1654f
100644
(file)
--- a/
arch/x86/include/asm/dma-mapping.h
+++ b/
arch/x86/include/asm/dma-mapping.h
@@
-8,10
+8,8
@@
*/
#include <linux/scatterlist.h>
-#include <linux/dma-debug.h>
#include <asm/io.h>
#include <asm/swiotlb.h>
-#include <linux/dma-contiguous.h>
extern int iommu_merge;
extern int panic_on_overflow;