Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[sfrench/cifs-2.6.git] / arch / sh / Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3297b87a40d61ddb1dd221abae18e70c9c643ff7..8d2cd1de57265c947a340396613dd2b83ff1e5a7 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -72,9 +72,6 @@ config SYS_SUPPORTS_NUMA
 config SYS_SUPPORTS_PCI
        bool
 
-config ARCH_MAY_HAVE_PC_FDC
-       bool
-
 config STACKTRACE_SUPPORT
        def_bool y
 
@@ -315,6 +312,13 @@ config CPU_SUBTYPE_SH7722
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_NUMA
 
+config CPU_SUBTYPE_SH7366
+       bool "Support SH7366 processor"
+       select CPU_SH4AL_DSP
+       select CPU_SHX2
+       select ARCH_SPARSEMEM_ENABLE
+       select SYS_SUPPORTS_NUMA
+
 # SH-5 Processor Support
 
 config CPU_SUBTYPE_SH5_101
@@ -323,6 +327,7 @@ config CPU_SUBTYPE_SH5_101
 
 config CPU_SUBTYPE_SH5_103
        bool "Support SH5-103 processor"
+       select CPU_SH5
 
 endchoice
 
@@ -448,13 +453,6 @@ config SH_SECUREEDGE5410
          This includes both the OEM SecureEdge products as well as the
          SME product line.
 
-config SH_7710VOIPGW
-       bool "SH7710-VOIP-GW"
-       depends on CPU_SUBTYPE_SH7710
-       help
-         Select this option to build a kernel for the SH7710 based
-         VOIP GW.
-
 config SH_RTS7751R2D
        bool "RTS7751R2D"
        depends on CPU_SUBTYPE_SH7751R
@@ -579,6 +577,7 @@ config SH_TIMER_IRQ
                        CPU_SUBTYPE_SH7763
        default "86" if CPU_SUBTYPE_SH7619
        default "140" if CPU_SUBTYPE_SH7206
+       default "142" if CPU_SUBTYPE_SH7203
        default "16"
 
 config SH_PCLK_FREQ