---

yaml --- r: 305299 b: refs/heads/master c: 0c60123 h: refs/heads/master i: 305297: 2252f15 305295: 3215732 v: v3
git-mirror · May 19, 2012 · 60c7ebf · 60c7ebf
1 parent aa9002b
commit 60c7ebf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8fd35fc586f74b2defe011d3a2bfb507871a407
+refs/heads/master: 0c6012313c22154367c36cecbc949d0fc120042e
diff --git a/trunk/arch/sh/include/cpu-sh4/cpu/dma.h b/trunk/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/trunk/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h → trunk/arch/sh/include/cpu-sh4a/cpu/dma.h b/trunk/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h → trunk/arch/sh/include/cpu-sh4a/cpu/dma.h