diff options
| -rw-r--r-- | drivers/dma/Makefile | 2 | ||||
| -rw-r--r-- | drivers/dma/sh/Makefile | 1 | ||||
| -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 obj-$(CONFIG_AT_HDMAC) += at_hdmac.o obj-$(CONFIG_MX3_IPU) += ipu/ obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o -obj-$(CONFIG_SH_DMAE) += shdma.o +obj-$(CONFIG_SH_DMAE) += sh/ obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/ obj-$(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 @@ #include <linux/spinlock.h> #include <linux/rculist.h> -#include "dmaengine.h" +#include "../dmaengine.h" #include "shdma.h" /* 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 |