diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-05-18 20:47:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-18 13:28:50 -0700 |
| commit | d5ec550a044c0136c3fece4007f05d08ee4a4fd8 (patch) | |
| tree | b2f9defcc80ff724f5c54d5c7717e10dc3cfadaa /arch/m68k | |
| parent | 52de114e357b8035d54040be8b9148de437b5b4b (diff) | |
| download | blackbird-op-linux-d5ec550a044c0136c3fece4007f05d08ee4a4fd8.tar.gz blackbird-op-linux-d5ec550a044c0136c3fece4007f05d08ee4a4fd8.zip | |
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')
| -rw-r--r-- | arch/m68k/kernel/setup.c | 6 |
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) /* 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; |
