Skip to content

Commit

Permalink
sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed May 19, 2012
1 parent d8fd35f commit 0c60123
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions arch/sh/include/cpu-sh4/cpu/dma.h
Original file line number Diff line number Diff line change
@@ -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>

/*
Expand All @@ -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
Expand All @@ -30,6 +23,4 @@

#define DMAOR_COD 0x00000008

#endif

#endif /* __ASM_CPU_SH4_DMA_H */
File renamed without changes.

0 comments on commit 0c60123

Please sign in to comment.