--- v2
+++ v1
@@ -1,8 +1,5 @@
Add a local private header file to contain definitions and declarations
which should only be used by DMA engine drivers.
-
-We also fix linux/dmaengine.h to use LINUX_DMAENGINE_H to guard against
-multiple inclusion.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
@@ -30,8 +27,7 @@
drivers/dma/ste_dma40.c | 1 +
drivers/dma/timb_dma.c | 2 ++
drivers/dma/txx9dmac.c | 2 ++
- include/linux/dmaengine.h | 4 ++--
- 25 files changed, 51 insertions(+), 2 deletions(-)
+ 24 files changed, 49 insertions(+), 0 deletions(-)
create mode 100644 drivers/dma/dmaengine.h
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
@@ -342,20 +338,5 @@
#include "txx9dmac.h"
static struct txx9dmac_chan *to_txx9dmac_chan(struct dma_chan *chan)
-diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
-index 41d0f92..4b17ca8 100644
---- a/include/linux/dmaengine.h
-+++ b/include/linux/dmaengine.h
-@@ -18,8 +18,8 @@
- * The full GNU General Public License is included in this distribution in the
- * file called COPYING.
- */
--#ifndef DMAENGINE_H
--#define DMAENGINE_H
-+#ifndef LINUX_DMAENGINE_H
-+#define LINUX_DMAENGINE_H
-
- #include <linux/device.h>
- #include <linux/uio.h>
--
1.7.4.4