aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sh/include/cpu-sh4/cpu/dma.h11
-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 @@
1#ifndef __ASM_CPU_SH4_DMA_H 1#ifndef __ASM_CPU_SH4_DMA_H
2#define __ASM_CPU_SH4_DMA_H 2#define __ASM_CPU_SH4_DMA_H
3 3
4/* SH7751/7760/7780 DMA IRQ sources */
5
6#ifdef CONFIG_CPU_SH4A
7
8#include <cpu/dma-sh4a.h>
9
10#else /* CONFIG_CPU_SH4A */
11
12#include <linux/sh_intc.h> 4#include <linux/sh_intc.h>
13 5
14/* 6/*
@@ -21,6 +13,7 @@
21 13
22#define SH_DMAC_BASE0 0xffa00000 14#define SH_DMAC_BASE0 0xffa00000
23#define SH_DMAC_BASE1 0xffa00070 15#define SH_DMAC_BASE1 0xffa00070
16
24/* Definitions for the SuperH DMAC */ 17/* Definitions for the SuperH DMAC */
25#define TM_BURST 0x00000080 18#define TM_BURST 0x00000080
26#define TS_8 0x00000010 19#define TS_8 0x00000010
@@ -30,6 +23,4 @@
30 23
31#define DMAOR_COD 0x00000008 24#define DMAOR_COD 0x00000008
32 25
33#endif
34
35#endif /* __ASM_CPU_SH4_DMA_H */ 26#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