---

yaml --- r: 305300 b: refs/heads/master c: 2ff9f31 h: refs/heads/master v: v3
git-mirror · May 19, 2012 · 6346c68 · 6346c68
1 parent 60c7ebf
commit 6346c68
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 53 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c6012313c22154367c36cecbc949d0fc120042e
+refs/heads/master: 2ff9f317f15b7c3bd95273a7f04ca0b148850104
diff --git a/trunk/arch/sh/include/asm/dma.h b/trunk/arch/sh/include/asm/dma.h
@@ -15,7 +15,6 @@
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include <linux/device.h>
-#include <cpu/dma.h>
 #include <asm-generic/dma.h>
 
 #ifdef CONFIG_NR_DMA_CHANNELS

diff --git a/trunk/arch/sh/include/cpu-sh2/cpu/dma.h b/trunk/arch/sh/include/cpu-sh2/cpu/dma.h
diff --git a/trunk/arch/sh/include/cpu-sh2a/cpu/dma.h b/trunk/arch/sh/include/cpu-sh2a/cpu/dma.h
diff --git a/trunk/arch/sh/include/cpu-sh3/cpu/dma.h b/trunk/arch/sh/include/cpu-sh3/cpu/dma.h
@@ -15,11 +15,4 @@
 #define DMTE0_IRQ	evt2irq(0x800)
 #define DMTE4_IRQ	evt2irq(0xb80)
 
-/* Definitions for the SuperH DMAC */
-#define TM_BURST	0x00000020
-#define TS_8		0x00000000
-#define TS_16		0x00000008
-#define TS_32		0x00000010
-#define TS_128		0x00000018
-
 #endif /* __ASM_CPU_SH3_DMA_H */
diff --git a/trunk/arch/sh/include/cpu-sh4/cpu/dma.h b/trunk/arch/sh/include/cpu-sh4/cpu/dma.h
@@ -14,13 +14,4 @@
 #define SH_DMAC_BASE0	0xffa00000
 #define SH_DMAC_BASE1	0xffa00070
 
-/* Definitions for the SuperH DMAC */
-#define TM_BURST	0x00000080
-#define TS_8		0x00000010
-#define TS_16		0x00000020
-#define TS_32		0x00000030
-#define TS_64		0x00000000
-
-#define DMAOR_COD	0x00000008
-
 #endif /* __ASM_CPU_SH4_DMA_H */
diff --git a/trunk/arch/sh/include/cpu-sh4a/cpu/dma.h b/trunk/arch/sh/include/cpu-sh4a/cpu/dma.h
@@ -77,9 +77,4 @@
 #define SH_DMARS_BASE0	0xFC809000
 #endif
 
-#define REQ_HE		0x000000C0
-#define REQ_H		0x00000080
-#define REQ_LE		0x00000040
-#define TM_BURST	0x00000020
-
 #endif /* __ASM_SH_CPU_SH4_DMA_SH7780_H */
diff --git a/trunk/arch/sh/include/cpu-sh5/cpu/dma.h b/trunk/arch/sh/include/cpu-sh5/cpu/dma.h