Messages in this thread Patch in this message | | | Date | Sun, 18 May 2008 20:47:22 +0200 | From | Geert Uytterhoeven <> | Subject | [patch 16/18] m68k: Correctly handle multi-ISA at runtime |
| |
From: Geert Uytterhoeven <geert@linux-m68k.org>
m68k: Correctly handle multi-ISA at runtime in multi-platform kernels
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- arch/m68k/kernel/setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
--- 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; -- Gr{oetje,eeting}s, Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
| |