diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 10:32:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 10:32:02 +0000 |
| commit | 9d1103d74ac88da4261a455611aa1660cf19d396 (patch) | |
| tree | e972035c58d5005441e06b7e77fad34df659117e /arch/mips/Makefile | |
| parent | 7896c4a2a71de4f71486e8b8a3e5c9bbb72c6789 (diff) | |
Merge all cases for the different Jazz machines into one single to avoid
multiple definitions when support for more than one system is enabled.
Diffstat (limited to 'arch/mips/Makefile')
| -rw-r--r-- | arch/mips/Makefile | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 7909bf042..f26952cef 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -95,11 +95,6 @@ CORE_FILES += arch/mips/algor/algor.o SUBDIRS += arch/mips/algor #LOADADDR += 0x80000000 endif -ifdef CONFIG_ACER_PICA_61 -CORE_FILES += arch/mips/jazz/jazz.o -SUBDIRS += arch/mips/jazz -LOADADDR += 0x80000000 -endif ifdef CONFIG_DECSTATION CORE_FILES += arch/mips/dec/dec.o SUBDIRS += arch/mips/dec @@ -116,17 +111,15 @@ CORE_FILES += arch/mips/deskstation/deskstation.o SUBDIRS += arch/mips/deskstation LOADADDR += 0x80000000 endif -ifdef CONFIG_MIPS_MAGNUM_3000 -LOADADDR += 0x80000000 -endif -ifdef CONFIG_MIPS_MAGNUM_4000 +# +# Acer PICA 61, Mips Magnum 4000 and Olivetti M700. +# +ifdef CONFIG_MIPS_JAZZ CORE_FILES += arch/mips/jazz/jazz.o SUBDIRS += arch/mips/jazz LOADADDR += 0x80000000 endif -ifdef CONFIG_OLIVETTI_M700 -CORE_FILES += arch/mips/jazz/jazz.o -SUBDIRS += arch/mips/jazz +ifdef CONFIG_MIPS_MAGNUM_3000 LOADADDR += 0x80000000 endif ifdef CONFIG_SNI_RM200_PCI |