summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2007-09-10 12:05:10 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-09-21 11:57:52 +0900
commit5cbc3af521a85aab8ae72c25afcf2698a7547cbd (patch)
tree48efae9104e1de9dc5672d645b85c843852a3635
parent953c8ef250fc6c329d1607cf9cd7fac1d72d7579 (diff)
downloadop-kernel-dev-5cbc3af521a85aab8ae72c25afcf2698a7547cbd.zip
op-kernel-dev-5cbc3af521a85aab8ae72c25afcf2698a7547cbd.tar.gz
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>
-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 c870f5f..b507b50 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -31,6 +31,7 @@ config EARLY_SCIF_CONSOLE_PORT
hex
depends on EARLY_SCIF_CONSOLE
default "0xffe00000" if CPU_SUBTYPE_SH7780
+ default "0xffea0000" if CPU_SUBTYPE_SH7785
default "0xfffe9800" if CPU_SUBTYPE_SH7206
default "0xf8420000" if CPU_SUBTYPE_SH7619
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 12aae0c..dadc4aa 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -10,7 +10,6 @@
* Atom Create Engineering Co., Ltd. 2002.
*/
#include <linux/init.h>
-#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/io.h>
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index dce59b8..5a92b3b 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -105,7 +105,6 @@ config CPU_SUBTYPE_SH7712
config CPU_SUBTYPE_SH7720
bool "Support SH7720 processor"
select CPU_SH3
- select CPU_HAS_INTC_IRQ
select CPU_HAS_DSP
help
Select SH7720 if you have a SH3-DSP SH7720 CPU.
OpenPOWER on IntegriCloud