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>

diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index c870f5fdef3490b7fc22c9f55a2b471743c1213a..b507b501f0cf2f4b24190945eb2742f8babdb261 100644 (file)
--- 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 12aae0ce1d11970a0c0602cfddbecb22fc28f13c..dadc4aa5ae825973c83ddc16f287361fc3afc6ad 100644 (file)
--- 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 dce59b812946156d2e68c5feeaa03f0d485d1a70..5a92b3becdd7af1b3a7e4772868ab7aab31eca52 100644 (file)
--- 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.