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]
/
arch
/
arm
/
mach-davinci
/
devices-da8xx.c
diff --git
a/arch/arm/mach-davinci/devices-da8xx.c
b/arch/arm/mach-davinci/devices-da8xx.c
index 1207eabe8d1cc43a5c9b386526097520cd4fa581..bb368938fc49214faae7be0ed62dbc02196a2786 100644
(file)
--- a/
arch/arm/mach-davinci/devices-da8xx.c
+++ b/
arch/arm/mach-davinci/devices-da8xx.c
@@
-10,7
+10,7
@@
#include <linux/clk-provider.h>
#include <linux/clk.h>
#include <linux/clkdev.h>
-#include <linux/dma-
contiguou
s.h>
+#include <linux/dma-
map-op
s.h>
#include <linux/dmaengine.h>
#include <linux/init.h>
#include <linux/io.h>