git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
arch
/
arm
/
plat-nomadik
/
include
/
plat
/
ste_dma40.h
diff --git
a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index
da1f08f
..
74b62f1
100644
(file)
--- a/
arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/
arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@
-12,7
+12,6
@@
#include <linux/dmaengine.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
-#include <linux/dmaengine.h>
/* dev types for memcpy */
#define STEDMA40_DEV_DST_MEMORY (-1)