sh: remove CONFIG_CPU_HAS_INTC_IRQ

All processor specific interrupt code is now converted to make use
of the new intc code. The config option CONFIG_CPU_HAS_INTC_IRQ is
because of that pointless.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 24c3361..c1214cc 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -178,9 +178,6 @@ config CPU_HAS_INTEVT
 config CPU_HAS_MASKREG_IRQ
        bool
 
-config CPU_HAS_INTC_IRQ
-       bool
-
 config CPU_HAS_IPR_IRQ
        bool
 

diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile
index 8712ec5..8da8e17 100644 (file)
--- a/arch/sh/kernel/cpu/irq/Makefile
+++ b/arch/sh/kernel/cpu/irq/Makefile
@@ -1,8 +1,7 @@
 #
 # Makefile for the Linux/SuperH CPU-specifc IRQ handlers.
 #
-obj-y  += imask.o
+obj-y  += imask.o intc.o
 
 obj-$(CONFIG_CPU_HAS_IPR_IRQ)          += ipr.o
 obj-$(CONFIG_CPU_HAS_MASKREG_IRQ)      += maskreg.o
-obj-$(CONFIG_CPU_HAS_INTC_IRQ)         += intc.o

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 1bebfe3..dce59b8 100644 (file)
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -50,40 +50,34 @@ choice
 config CPU_SUBTYPE_SH7619
        bool "Support SH7619 processor"
        select CPU_SH2
-       select CPU_HAS_INTC_IRQ
 
 # SH-2A Processor Support
 
 config CPU_SUBTYPE_SH7206
        bool "Support SH7206 processor"
        select CPU_SH2A
-       select CPU_HAS_INTC_IRQ
 
 # SH-3 Processor Support
 
 config CPU_SUBTYPE_SH7705
        bool "Support SH7705 processor"
        select CPU_SH3
-       select CPU_HAS_INTC_IRQ
 
 config CPU_SUBTYPE_SH7706
        bool "Support SH7706 processor"
        select CPU_SH3
-       select CPU_HAS_INTC_IRQ
        help
          Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
 
 config CPU_SUBTYPE_SH7707
        bool "Support SH7707 processor"
        select CPU_SH3
-       select CPU_HAS_INTC_IRQ
        help
          Select SH7707 if you have a  60 Mhz SH-3 HD6417707 CPU.
 
 config CPU_SUBTYPE_SH7708
        bool "Support SH7708 processor"
        select CPU_SH3
-       select CPU_HAS_INTC_IRQ
        help
          Select SH7708 if you have a  60 Mhz SH-3 HD6417708S or
          if you have a 100 Mhz SH-3 HD6417708R CPU.
@@ -91,14 +85,12 @@ config CPU_SUBTYPE_SH7708
 config CPU_SUBTYPE_SH7709
        bool "Support SH7709 processor"
        select CPU_SH3
-       select CPU_HAS_INTC_IRQ
        help
          Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.
 
 config CPU_SUBTYPE_SH7710
        bool "Support SH7710 processor"
        select CPU_SH3
-       select CPU_HAS_INTC_IRQ
        select CPU_HAS_DSP
        help
          Select SH7710 if you have a SH3-DSP SH7710 CPU.
@@ -106,7 +98,6 @@ config CPU_SUBTYPE_SH7710
 config CPU_SUBTYPE_SH7712
        bool "Support SH7712 processor"
        select CPU_SH3
-       select CPU_HAS_INTC_IRQ
        select CPU_HAS_DSP
        help
          Select SH7712 if you have a SH3-DSP SH7712 CPU.
@@ -124,14 +115,12 @@ config CPU_SUBTYPE_SH7720
 config CPU_SUBTYPE_SH7750
        bool "Support SH7750 processor"
        select CPU_SH4
-       select CPU_HAS_INTC_IRQ
        help
          Select SH7750 if you have a 200 Mhz SH-4 HD6417750 CPU.
 
 config CPU_SUBTYPE_SH7091
        bool "Support SH7091 processor"
        select CPU_SH4
-       select CPU_HAS_INTC_IRQ
        help
          Select SH7091 if you have an SH-4 based Sega device (such as
          the Dreamcast, Naomi, and Naomi 2).
@@ -139,17 +128,14 @@ config CPU_SUBTYPE_SH7091
 config CPU_SUBTYPE_SH7750R
        bool "Support SH7750R processor"
        select CPU_SH4
-       select CPU_HAS_INTC_IRQ
 
 config CPU_SUBTYPE_SH7750S
        bool "Support SH7750S processor"
        select CPU_SH4
-       select CPU_HAS_INTC_IRQ
 
 config CPU_SUBTYPE_SH7751
        bool "Support SH7751 processor"
        select CPU_SH4
-       select CPU_HAS_INTC_IRQ
        help
          Select SH7751 if you have a 166 Mhz SH-4 HD6417751 CPU,
          or if you have a HD6417751R CPU.
@@ -157,12 +143,10 @@ config CPU_SUBTYPE_SH7751
 config CPU_SUBTYPE_SH7751R
        bool "Support SH7751R processor"
        select CPU_SH4
-       select CPU_HAS_INTC_IRQ
 
 config CPU_SUBTYPE_SH7760
        bool "Support SH7760 processor"
        select CPU_SH4
-       select CPU_HAS_INTC_IRQ
 
 config CPU_SUBTYPE_SH4_202
        bool "Support SH4-202 processor"
@@ -192,19 +176,16 @@ config CPU_SUBTYPE_SH7770
 config CPU_SUBTYPE_SH7780
        bool "Support SH7780 processor"
        select CPU_SH4A
-       select CPU_HAS_INTC_IRQ
 
 config CPU_SUBTYPE_SH7785
        bool "Support SH7785 processor"
        select CPU_SH4A
        select CPU_SHX2
-       select CPU_HAS_INTC_IRQ
 
 config CPU_SUBTYPE_SHX3
        bool "Support SH-X3 processor"
        select CPU_SH4A
        select CPU_SHX3
-       select CPU_HAS_INTC_IRQ
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_NUMA
 
@@ -218,7 +199,6 @@ config CPU_SUBTYPE_SH7722
        bool "Support SH7722 processor"
        select CPU_SH4AL_DSP
        select CPU_SHX2
-       select CPU_HAS_INTC_IRQ
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_NUMA