diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-16 12:52:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-16 12:52:32 +0000 |
commit | 851076b71233028f17a395f19821abdc46a34715 (patch) | |
tree | bdb6e4510cef9a33c57749ca174c49e087e99150 /arch/mips/kernel | |
parent | dc2e1a589aa53a62f60136a4eb727fa770d2e02e (diff) |
More loose bits (grrr) ...
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/Makefile | 6 | ||||
-rw-r--r-- | arch/mips/kernel/setup.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index b4c91f991..ec2eae67e 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -11,7 +11,7 @@ .S.o: $(CC) $(AFLAGS) -c $< -o $@ -EXTRA_ASFLAGS = -mips3 -mcpu=r4000 +EXTRA_AFLAGS = -mips3 -mcpu=r4000 all: kernel.o head.o init_task.o @@ -54,7 +54,9 @@ ifndef CONFIG_DECSTATION ifndef CONFIG_MIPS_EV96100 ifndef CONFIG_MIPS_ITE8172 ifndef CONFIG_NINO - obj-y += time.o + ifndef CONFIG_MIPS_IVR + obj-y += time.o + endif endif endif endif diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8815cbb20..04f2ee113 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -548,11 +548,12 @@ void __init setup_arch(char **cmdline_p) ev64120_setup(); break; #endif -#ifdef CONFIG_MIPS_ITE8172 +#if defined(CONFIG_MIPS_IVR) || defined(CONFIG_MIPS_ITE8172) case MACH_GROUP_ITE: + case MACH_GROUP_GLOBESPAN: it8172_setup(); break; -#endif +#endif #ifdef CONFIG_NINO case MACH_GROUP_PHILIPS: nino_setup(); |