evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a.

Browse source 
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 <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2012-05-19 18:06:12 +09:00
parent d8fd35fc58
commit 0c6012313c
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/sh/include/cpu-sh4/cpu/dma.h
View file

@ -1,14 +1,6 @@
#ifndef __ASM_CPU_SH4_DMA_H #ifndef __ASM_CPU_SH4_DMA_H
#define __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> #include <linux/sh_intc.h>
/* /*
@ -21,6 +13,7 @@
#define SH_DMAC_BASE0 0xffa00000 #define SH_DMAC_BASE0 0xffa00000
#define SH_DMAC_BASE1 0xffa00070 #define SH_DMAC_BASE1 0xffa00070
/* Definitions for the SuperH DMAC */ /* Definitions for the SuperH DMAC */
#define TM_BURST 0x00000080 #define TM_BURST 0x00000080
#define TS_8 0x00000010 #define TS_8 0x00000010
@ -30,6 +23,4 @@
#define DMAOR_COD 0x00000008 #define DMAOR_COD 0x00000008
#endif
#endif /* __ASM_CPU_SH4_DMA_H */ #endif /* __ASM_CPU_SH4_DMA_H */

0
arch/sh/include/cpu-sh4/cpu/dma-sh4a.h → arch/sh/include/cpu-sh4a/cpu/dma.h
View file