diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-05-19 11:06:12 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-19 11:06:12 +0200 |
| commit | 0c6012313c22154367c36cecbc949d0fc120042e (patch) | |
| tree | 993f6bb6224062d78145a1e553b2cd5ef45f3846 /arch/sh | |
| parent | sh64: Fix up vmalloc fault range check. (diff) | |
| download | linux-0c6012313c22154367c36cecbc949d0fc120042e.tar.xz linux-0c6012313c22154367c36cecbc949d0fc120042e.zip | |
sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a.
cpu-sh4a headers take priority over cpu-sh4 ones by virtue of the build
system, there's no need to try and mingle sh4a stuff in cpu-sh4.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/cpu-sh4/cpu/dma.h | 11 | ||||
| -rw-r--r-- | arch/sh/include/cpu-sh4a/cpu/dma.h (renamed from arch/sh/include/cpu-sh4/cpu/dma-sh4a.h) | 0 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/sh/include/cpu-sh4/cpu/dma.h b/arch/sh/include/cpu-sh4/cpu/dma.h index 9d32e2dd2554..6d7b66b6fe7e 100644 --- a/arch/sh/include/cpu-sh4/cpu/dma.h +++ b/arch/sh/include/cpu-sh4/cpu/dma.h @@ -1,14 +1,6 @@ #ifndef __ASM_CPU_SH4_DMA_H #define __ASM_CPU_SH4_DMA_H -/* SH7751/7760/7780 DMA IRQ sources */ - -#ifdef CONFIG_CPU_SH4A - -#include <cpu/dma-sh4a.h> - -#else /* CONFIG_CPU_SH4A */ - #include <linux/sh_intc.h> /* @@ -21,6 +13,7 @@ #define SH_DMAC_BASE0 0xffa00000 #define SH_DMAC_BASE1 0xffa00070 + /* Definitions for the SuperH DMAC */ #define TM_BURST 0x00000080 #define TS_8 0x00000010 @@ -30,6 +23,4 @@ #define DMAOR_COD 0x00000008 -#endif - #endif /* __ASM_CPU_SH4_DMA_H */ diff --git a/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h b/arch/sh/include/cpu-sh4a/cpu/dma.h index f280410c93ae..f280410c93ae 100644 --- a/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h +++ b/arch/sh/include/cpu-sh4a/cpu/dma.h |