projects
/
linux-2.6-block.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>
[linux-2.6-block.git]
/
drivers
/
iommu
/
dma-iommu.c
diff --git
a/drivers/iommu/dma-iommu.c
b/drivers/iommu/dma-iommu.c
index d2e3f26228151fb77e5c94129b785b9b3f39a567..22c221bba13e2fe632b61fa52c61b9f6fc1f44ea 100644
(file)
--- a/
drivers/iommu/dma-iommu.c
+++ b/
drivers/iommu/dma-iommu.c
@@
-11,7
+11,6
@@
#include <linux/acpi_iort.h>
#include <linux/device.h>
#include <linux/dma-map-ops.h>
#include <linux/acpi_iort.h>
#include <linux/device.h>
#include <linux/dma-map-ops.h>
-#include <linux/dma-contiguous.h>
#include <linux/dma-iommu.h>
#include <linux/dma-noncoherent.h>
#include <linux/gfp.h>
#include <linux/dma-iommu.h>
#include <linux/dma-noncoherent.h>
#include <linux/gfp.h>