tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Geert Uytterhoeven and committed by
Linus Torvalds d5ec550a 52de114e

+3 -3
+3 -3
arch/m68k/kernel/setup.c
··· 346 346 347 347 /* set ISA defs early as possible */ 348 348 #if defined(CONFIG_ISA) && defined(MULTI_ISA) 349 - #if defined(CONFIG_Q40) 350 349 if (MACH_IS_Q40) { 351 350 isa_type = ISA_TYPE_Q40; 352 351 isa_sex = 0; 353 352 } 354 - #elif defined(CONFIG_GG2) 353 + #ifdef CONFIG_GG2 355 354 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) { 356 355 isa_type = ISA_TYPE_GG2; 357 356 isa_sex = 0; 358 357 } 359 - #elif defined(CONFIG_AMIGA_PCMCIA) 358 + #endif 359 + #ifdef CONFIG_AMIGA_PCMCIA 360 360 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) { 361 361 isa_type = ISA_TYPE_AG; 362 362 isa_sex = 1;