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 /arch/mips/lasat/setup.c | |
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 'arch/mips/lasat/setup.c')
-rw-r--r-- | arch/mips/lasat/setup.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index e072da4ff3b3..dbd3163a85c2 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c | |||
@@ -127,9 +127,11 @@ void __init plat_time_init(void) | |||
127 | void __init plat_mem_setup(void) | 127 | void __init plat_mem_setup(void) |
128 | { | 128 | { |
129 | int i; | 129 | int i; |
130 | lasat_misc = &lasat_misc_info[mips_machtype]; | 130 | int lasat_type = IS_LASAT_200() ? 1 : 0; |
131 | |||
132 | lasat_misc = &lasat_misc_info[lasat_type]; | ||
131 | #ifdef CONFIG_PICVUE | 133 | #ifdef CONFIG_PICVUE |
132 | picvue = &pvc_defs[mips_machtype]; | 134 | picvue = &pvc_defs[lasat_type]; |
133 | #endif | 135 | #endif |
134 | 136 | ||
135 | /* Set up panic notifier */ | 137 | /* Set up panic notifier */ |
@@ -140,7 +142,7 @@ void __init plat_mem_setup(void) | |||
140 | lasat_reboot_setup(); | 142 | lasat_reboot_setup(); |
141 | 143 | ||
142 | #ifdef CONFIG_DS1603 | 144 | #ifdef CONFIG_DS1603 |
143 | ds1603 = &ds_defs[mips_machtype]; | 145 | ds1603 = &ds_defs[lasat_type]; |
144 | #endif | 146 | #endif |
145 | 147 | ||
146 | #ifdef DYNAMIC_SERIAL_INIT | 148 | #ifdef DYNAMIC_SERIAL_INIT |