From 0c6012313c22154367c36cecbc949d0fc120042e Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Sat, 19 May 2012 18:06:12 +0900 Subject: [PATCH] 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 --- arch/sh/include/cpu-sh4/cpu/dma.h | 11 +---------- .../{cpu-sh4/cpu/dma-sh4a.h => cpu-sh4a/cpu/dma.h} | 0 2 files changed, 1 insertion(+), 10 deletions(-) rename arch/sh/include/{cpu-sh4/cpu/dma-sh4a.h => cpu-sh4a/cpu/dma.h} (100%) 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 - -#else /* CONFIG_CPU_SH4A */ - #include /* @@ -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 similarity index 100% rename from arch/sh/include/cpu-sh4/cpu/dma-sh4a.h rename to arch/sh/include/cpu-sh4a/cpu/dma.h -- 2.20.1