diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-08-31 23:59:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-31 23:59:37 -0400 |
commit | 5110bd21b8af4199b8332c0ab0b23367556653d3 (patch) | |
tree | fcd655bb454ee7b0382aa200d9a2e160465ac6ae /arch/sparc/kernel/setup.c | |
parent | b69416b51be0757c82f1c5a0a3f0995a4484dab4 (diff) |
sparc: remove CONFIG_SUN4
While doing some easy cleanups on the sparc code I noticed that the
CONFIG_SUN4 code seems to be worse than the rest - there were some
"I don't know how it should work, but the current code definitely cannot
work." places.
And while I have seen people running Linux on machines like a
SPARCstation 5 a few years ago I don't recall having seen sun4
machines, even less ones running Linux.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/setup.c')
-rw-r--r-- | arch/sparc/kernel/setup.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 9e451b21202e..8d5fbce1635b 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
@@ -224,12 +224,6 @@ void __init setup_arch(char **cmdline_p) | |||
224 | if(!strcmp(&cputypval,"sun4e")) { sparc_cpu_model=sun4e; } | 224 | if(!strcmp(&cputypval,"sun4e")) { sparc_cpu_model=sun4e; } |
225 | if(!strcmp(&cputypval,"sun4u")) { sparc_cpu_model=sun4u; } | 225 | if(!strcmp(&cputypval,"sun4u")) { sparc_cpu_model=sun4u; } |
226 | 226 | ||
227 | #ifdef CONFIG_SUN4 | ||
228 | if (sparc_cpu_model != sun4) { | ||
229 | prom_printf("This kernel is for Sun4 architecture only.\n"); | ||
230 | prom_halt(); | ||
231 | } | ||
232 | #endif | ||
233 | printk("ARCH: "); | 227 | printk("ARCH: "); |
234 | switch(sparc_cpu_model) { | 228 | switch(sparc_cpu_model) { |
235 | case sun4: | 229 | case sun4: |
@@ -263,7 +257,7 @@ void __init setup_arch(char **cmdline_p) | |||
263 | boot_flags_init(*cmdline_p); | 257 | boot_flags_init(*cmdline_p); |
264 | 258 | ||
265 | idprom_init(); | 259 | idprom_init(); |
266 | if (ARCH_SUN4C_SUN4) | 260 | if (ARCH_SUN4C) |
267 | sun4c_probe_vac(); | 261 | sun4c_probe_vac(); |
268 | load_mmu(); | 262 | load_mmu(); |
269 | 263 | ||