From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 18 May 2008 18:47:22 +0000 (+0200)
Subject: m68k: Correctly handle multi-ISA at runtime
X-Git-Tag: v2.6.26-rc3~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d5ec550a044c0136c3fece4007f05d08ee4a4fd8;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index 02bb9634f0e..a9fb83a8c18 100644
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -346,17 +346,17 @@ void __init setup_arch(char **cmdline_p)
 
 /* set ISA defs early as possible */
 #if defined(CONFIG_ISA) && defined(MULTI_ISA)
-#if defined(CONFIG_Q40)
 	if (MACH_IS_Q40) {
 		isa_type = ISA_TYPE_Q40;
 		isa_sex = 0;
 	}
-#elif defined(CONFIG_GG2)
+#ifdef CONFIG_GG2
 	if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) {
 		isa_type = ISA_TYPE_GG2;
 		isa_sex = 0;
 	}
-#elif defined(CONFIG_AMIGA_PCMCIA)
+#endif
+#ifdef CONFIG_AMIGA_PCMCIA
 	if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) {
 		isa_type = ISA_TYPE_AG;
 		isa_sex = 1;