sh: Kill off dead SH7604 support.

This was added during 2.5.x, but was never moved along. This
can easily be resurrected if someone has one they wish to work
with, but it's not worth keeping around in its current form.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2 files changed, 2 insertions, 10 deletions

diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c
index 108e81b682ed..74765ae42929 100644
--- a/arch/sh/kernel/cpu/sh2/probe.c
+++ b/arch/sh/kernel/cpu/sh2/probe.c
@@ -17,15 +17,7 @@
 
 int __init detect_cpu_and_cache_system(void)
 {
-#if defined(CONFIG_CPU_SUBTYPE_SH7604)
-        current_cpu_data.type                   = CPU_SH7604;
-        current_cpu_data.dcache.ways            = 4;
-        current_cpu_data.dcache.way_incr        = (1<<10);
-        current_cpu_data.dcache.sets            = 64;
-        current_cpu_data.dcache.entry_shift     = 4;
-        current_cpu_data.dcache.linesz          = L1_CACHE_BYTES;
-        current_cpu_data.dcache.flags           = 0;
-#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
+#if defined(CONFIG_CPU_SUBTYPE_SH7619)
         current_cpu_data.type                   = CPU_SH7619;
         current_cpu_data.dcache.ways            = 4;
         current_cpu_data.dcache.way_incr        = (1<<12);
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index c2c6bfdf4dfe..765f83c1bca4 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -271,7 +271,7 @@ void __init setup_arch(char **cmdline_p)
 
 static const char *cpu_name[] = {
         [CPU_SH7206]    = "SH7206",     [CPU_SH7619]    = "SH7619",
-        [CPU_SH7604]    = "SH7604",     [CPU_SH7300]    = "SH7300",
+        [CPU_SH7300]    = "SH7300",
         [CPU_SH7705]    = "SH7705",     [CPU_SH7706]    = "SH7706",
         [CPU_SH7707]    = "SH7707",     [CPU_SH7708]    = "SH7708",
         [CPU_SH7709]    = "SH7709",     [CPU_SH7710]    = "SH7710",