aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2008-05-18 14:47:22 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-18 16:28:50 -0400
commitd5ec550a044c0136c3fece4007f05d08ee4a4fd8 (patch)
treeb2f9defcc80ff724f5c54d5c7717e10dc3cfadaa /arch/m68k/kernel
parent52de114e357b8035d54040be8b9148de437b5b4b (diff)
m68k: Correctly handle multi-ISA at runtime
m68k: Correctly handle multi-ISA at runtime in multi-platform kernels Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r--arch/m68k/kernel/setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index 02bb9634f0e1..a9fb83a8c180 100644
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -346,17 +346,17 @@ void __init setup_arch(char **cmdline_p)
346 346
347/* set ISA defs early as possible */ 347/* set ISA defs early as possible */
348#if defined(CONFIG_ISA) && defined(MULTI_ISA) 348#if defined(CONFIG_ISA) && defined(MULTI_ISA)
349#if defined(CONFIG_Q40)
350 if (MACH_IS_Q40) { 349 if (MACH_IS_Q40) {
351 isa_type = ISA_TYPE_Q40; 350 isa_type = ISA_TYPE_Q40;
352 isa_sex = 0; 351 isa_sex = 0;
353 } 352 }
354#elif defined(CONFIG_GG2) 353#ifdef CONFIG_GG2
355 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) { 354 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) {
356 isa_type = ISA_TYPE_GG2; 355 isa_type = ISA_TYPE_GG2;
357 isa_sex = 0; 356 isa_sex = 0;
358 } 357 }
359#elif defined(CONFIG_AMIGA_PCMCIA) 358#endif
359#ifdef CONFIG_AMIGA_PCMCIA
360 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) { 360 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) {
361 isa_type = ISA_TYPE_AG; 361 isa_type = ISA_TYPE_AG;
362 isa_sex = 1; 362 isa_sex = 1;