From 60c7ebf6ae42f1da669c67a0af9e2f4276024ca5 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Sat, 19 May 2012 18:06:12 +0900
Subject: [PATCH] --- yaml --- r: 305299 b: refs/heads/master c:
 0c6012313c22154367c36cecbc949d0fc120042e h: refs/heads/master i:   305297:
 2252f1540913a316b70153f2e404b84fd29999a0   305295:
 321573236c58a2334820285b3b5ba468bd8b3e44 v: v3

---
 [refs]                                                |  2 +-
 trunk/arch/sh/include/cpu-sh4/cpu/dma.h               | 11 +----------
 .../{cpu-sh4/cpu/dma-sh4a.h => cpu-sh4a/cpu/dma.h}    |  0
 3 files changed, 2 insertions(+), 11 deletions(-)
 rename trunk/arch/sh/include/{cpu-sh4/cpu/dma-sh4a.h => cpu-sh4a/cpu/dma.h} (100%)

diff --git a/[refs] b/[refs]
index 5a8dd4389154..84c6bd9c5345 100644
--- 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
index 9d32e2dd2554..6d7b66b6fe7e 100644
--- 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 b/trunk/arch/sh/include/cpu-sh4a/cpu/dma.h
similarity index 100%
rename from trunk/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h
rename to trunk/arch/sh/include/cpu-sh4a/cpu/dma.h