diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2002-07-23 06:22:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-23 06:22:50 -0700 |
| commit | d2b3bb9bd2931086cee836e8bcd6857312fff6ec (patch) | |
| tree | 3e372cb95e301a784cf35c0c138835e83f083b5d /arch/m68k/kernel/setup.c | |
| parent | b1b26de5d91d26e039490deb53ed283442ba777e (diff) | |
[PATCH] M68k update (part 25)
Update ISA space code on m68k (from 2.4.x)
- Add support for multiple types of ISA busses in one kernel image (e.g. an
image for both Q40 and Amiga with PCMCIA)
- Allow port operations on m68k if CONFIG_ISA is defined
Diffstat (limited to 'arch/m68k/kernel/setup.c')
| -rw-r--r-- | arch/m68k/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 893d176dc924..9c2499ba21ed 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c @@ -109,7 +109,7 @@ int mach_sysrq_shift_mask = 0; char *mach_sysrq_xlate = NULL; #endif -#if defined(CONFIG_ISA) +#if defined(CONFIG_ISA) && defined(MULTI_ISA) int isa_type; int isa_sex; #endif @@ -399,7 +399,7 @@ void __init setup_arch(char **cmdline_p) paging_init(); /* set ISA defs early as possible */ -#if defined(CONFIG_ISA) +#if defined(CONFIG_ISA) && defined(MULTI_ISA) #if defined(CONFIG_Q40) if (MACH_IS_Q40) { isa_type = Q40_ISA; |