aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2007-09-09 23:05:10 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-09-20 22:57:52 -0400
commit5cbc3af521a85aab8ae72c25afcf2698a7547cbd (patch)
tree48efae9104e1de9dc5672d645b85c843852a3635 /arch
parent953c8ef250fc6c329d1607cf9cd7fac1d72d7579 (diff)
sh: minor fixes
This patch contains the following fixes: - Adds sh7785 support to CONFIG_EARLY_SCIF_CONSOLE_PORT. - Removes duplicate include from rts7751r2d irq code. - Removes CONFIG_CPU_HAS_INTC from sh7720 Kconfig entry. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/Kconfig.debug1
-rw-r--r--arch/sh/boards/renesas/rts7751r2d/irq.c1
-rw-r--r--arch/sh/mm/Kconfig1
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index c870f5fdef34..b507b501f0cf 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -31,6 +31,7 @@ config EARLY_SCIF_CONSOLE_PORT
31 hex 31 hex
32 depends on EARLY_SCIF_CONSOLE 32 depends on EARLY_SCIF_CONSOLE
33 default "0xffe00000" if CPU_SUBTYPE_SH7780 33 default "0xffe00000" if CPU_SUBTYPE_SH7780
34 default "0xffea0000" if CPU_SUBTYPE_SH7785
34 default "0xfffe9800" if CPU_SUBTYPE_SH7206 35 default "0xfffe9800" if CPU_SUBTYPE_SH7206
35 default "0xf8420000" if CPU_SUBTYPE_SH7619 36 default "0xf8420000" if CPU_SUBTYPE_SH7619
36 default "0xa4400000" if CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7705 37 default "0xa4400000" if CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7705
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index 12aae0ce1d11..dadc4aa5ae82 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -10,7 +10,6 @@
10 * Atom Create Engineering Co., Ltd. 2002. 10 * Atom Create Engineering Co., Ltd. 2002.
11 */ 11 */
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/interrupt.h>
14#include <linux/irq.h> 13#include <linux/irq.h>
15#include <linux/interrupt.h> 14#include <linux/interrupt.h>
16#include <linux/io.h> 15#include <linux/io.h>
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index dce59b812946..5a92b3becdd7 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -105,7 +105,6 @@ config CPU_SUBTYPE_SH7712
105config CPU_SUBTYPE_SH7720 105config CPU_SUBTYPE_SH7720
106 bool "Support SH7720 processor" 106 bool "Support SH7720 processor"
107 select CPU_SH3 107 select CPU_SH3
108 select CPU_HAS_INTC_IRQ
109 select CPU_HAS_DSP 108 select CPU_HAS_DSP
110 help 109 help
111 Select SH7720 if you have a SH3-DSP SH7720 CPU. 110 Select SH7720 if you have a SH3-DSP SH7720 CPU.