diff options
author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2008-07-14 10:58:47 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 13:44:39 -0400 |
commit | b27418aa551a153e8bf1bd16cf93e5786f9590a9 (patch) | |
tree | 568fdf598effa5fe58e10781595392f101198529 /include/asm-mips | |
parent | 0b56fd8c7abbf85baeecb77be25c54d3c7d11587 (diff) |
[MIPS] Remove mips_machtype for LASAT machines
This is the LASAT part of the mips_machtype removal.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/bootinfo.h | 6 | ||||
-rw-r--r-- | include/asm-mips/lasat/lasat.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h index 51dbec9dabfd..d39e143b4a3c 100644 --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h | |||
@@ -41,12 +41,6 @@ | |||
41 | #define MACH_DS5900 10 /* DECsystem 5900 */ | 41 | #define MACH_DS5900 10 /* DECsystem 5900 */ |
42 | 42 | ||
43 | /* | 43 | /* |
44 | * Valid machtype for group LASAT | ||
45 | */ | ||
46 | #define MACH_LASAT_100 0 /* Masquerade II/SP100/SP50/SP25 */ | ||
47 | #define MACH_LASAT_200 1 /* Masquerade PRO/SP200 */ | ||
48 | |||
49 | /* | ||
50 | * Valid machtype for group PMC-MSP | 44 | * Valid machtype for group PMC-MSP |
51 | */ | 45 | */ |
52 | #define MACH_MSP4200_EVAL 0 /* PMC-Sierra MSP4200 Evaluation */ | 46 | #define MACH_MSP4200_EVAL 0 /* PMC-Sierra MSP4200 Evaluation */ |
diff --git a/include/asm-mips/lasat/lasat.h b/include/asm-mips/lasat/lasat.h index ea04d9262edc..caeba1e302a2 100644 --- a/include/asm-mips/lasat/lasat.h +++ b/include/asm-mips/lasat/lasat.h | |||
@@ -240,6 +240,8 @@ static inline void lasat_ndelay(unsigned int ns) | |||
240 | __delay(ns / lasat_ndelay_divider); | 240 | __delay(ns / lasat_ndelay_divider); |
241 | } | 241 | } |
242 | 242 | ||
243 | #define IS_LASAT_200() (current_cpu_data.cputype == CPU_R5000) | ||
244 | |||
243 | #endif /* !defined (_LANGUAGE_ASSEMBLY) */ | 245 | #endif /* !defined (_LANGUAGE_ASSEMBLY) */ |
244 | 246 | ||
245 | #define LASAT_SERVICEMODE_MAGIC_1 0xdeadbeef | 247 | #define LASAT_SERVICEMODE_MAGIC_1 0xdeadbeef |