aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/Makefile2
-rw-r--r--drivers/dma/sh/Makefile1
-rw-r--r--drivers/dma/sh/shdma.c (renamed from drivers/dma/shdma.c)2
-rw-r--r--drivers/dma/sh/shdma.h (renamed from drivers/dma/shdma.h)0
4 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 370a65562242..640356add0a3 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -14,7 +14,7 @@ obj-$(CONFIG_DW_DMAC) += dw_dmac.o
14obj-$(CONFIG_AT_HDMAC) += at_hdmac.o 14obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
15obj-$(CONFIG_MX3_IPU) += ipu/ 15obj-$(CONFIG_MX3_IPU) += ipu/
16obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o 16obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
17obj-$(CONFIG_SH_DMAE) += shdma.o 17obj-$(CONFIG_SH_DMAE) += sh/
18obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o 18obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
19obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/ 19obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
20obj-$(CONFIG_IMX_SDMA) += imx-sdma.o 20obj-$(CONFIG_IMX_SDMA) += imx-sdma.o
diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile
new file mode 100644
index 000000000000..ad4981af38b2
--- /dev/null
+++ b/drivers/dma/sh/Makefile
@@ -0,0 +1 @@
obj-$(CONFIG_SH_DMAE) += shdma.o
diff --git a/drivers/dma/shdma.c b/drivers/dma/sh/shdma.c
index 19d7a8d3975d..8ab4a1f5d3c1 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/sh/shdma.c
@@ -31,7 +31,7 @@
31#include <linux/spinlock.h> 31#include <linux/spinlock.h>
32#include <linux/rculist.h> 32#include <linux/rculist.h>
33 33
34#include "dmaengine.h" 34#include "../dmaengine.h"
35#include "shdma.h" 35#include "shdma.h"
36 36
37/* DMA descriptor control */ 37/* DMA descriptor control */
diff --git a/drivers/dma/shdma.h b/drivers/dma/sh/shdma.h
index 0b1d2c105f02..0b1d2c105f02 100644
--- a/drivers/dma/shdma.h
+++ b/drivers/dma/sh/shdma.h