diff options
Diffstat (limited to 'arch/mips/momentum/jaguar_atx')
-rw-r--r-- | arch/mips/momentum/jaguar_atx/prom.c | 10 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/reset.c | 2 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/setup.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/momentum/jaguar_atx/prom.c b/arch/mips/momentum/jaguar_atx/prom.c index fa5982ac0ac6..827960802b8f 100644 --- a/arch/mips/momentum/jaguar_atx/prom.c +++ b/arch/mips/momentum/jaguar_atx/prom.c | |||
@@ -90,7 +90,7 @@ void get_mac(char dest[6]) | |||
90 | } | 90 | } |
91 | #endif | 91 | #endif |
92 | 92 | ||
93 | #ifdef CONFIG_MIPS64 | 93 | #ifdef CONFIG_64BIT |
94 | 94 | ||
95 | unsigned long signext(unsigned long addr) | 95 | unsigned long signext(unsigned long addr) |
96 | { | 96 | { |
@@ -143,7 +143,7 @@ char *arg64(unsigned long addrin, int arg_index) | |||
143 | 143 | ||
144 | return p; | 144 | return p; |
145 | } | 145 | } |
146 | #endif /* CONFIG_MIPS64 */ | 146 | #endif /* CONFIG_64BIT */ |
147 | 147 | ||
148 | /* PMON passes arguments in C main() style */ | 148 | /* PMON passes arguments in C main() style */ |
149 | void __init prom_init(void) | 149 | void __init prom_init(void) |
@@ -158,7 +158,7 @@ void __init prom_init(void) | |||
158 | // ja_setup_console(); /* The very first thing. */ | 158 | // ja_setup_console(); /* The very first thing. */ |
159 | #endif | 159 | #endif |
160 | 160 | ||
161 | #ifdef CONFIG_MIPS64 | 161 | #ifdef CONFIG_64BIT |
162 | char *ptr; | 162 | char *ptr; |
163 | 163 | ||
164 | printk("Mips64 Jaguar-ATX\n"); | 164 | printk("Mips64 Jaguar-ATX\n"); |
@@ -201,7 +201,7 @@ void __init prom_init(void) | |||
201 | } | 201 | } |
202 | printk("arcs_cmdline: %s\n", arcs_cmdline); | 202 | printk("arcs_cmdline: %s\n", arcs_cmdline); |
203 | 203 | ||
204 | #else /* CONFIG_MIPS64 */ | 204 | #else /* CONFIG_64BIT */ |
205 | /* save the PROM vectors for debugging use */ | 205 | /* save the PROM vectors for debugging use */ |
206 | debug_vectors = cv; | 206 | debug_vectors = cv; |
207 | 207 | ||
@@ -226,7 +226,7 @@ void __init prom_init(void) | |||
226 | } | 226 | } |
227 | env++; | 227 | env++; |
228 | } | 228 | } |
229 | #endif /* CONFIG_MIPS64 */ | 229 | #endif /* CONFIG_64BIT */ |
230 | mips_machgroup = MACH_GROUP_MOMENCO; | 230 | mips_machgroup = MACH_GROUP_MOMENCO; |
231 | mips_machtype = MACH_MOMENCO_JAGUAR_ATX; | 231 | mips_machtype = MACH_MOMENCO_JAGUAR_ATX; |
232 | 232 | ||
diff --git a/arch/mips/momentum/jaguar_atx/reset.c b/arch/mips/momentum/jaguar_atx/reset.c index 48039484cdf9..c4236b1e59fa 100644 --- a/arch/mips/momentum/jaguar_atx/reset.c +++ b/arch/mips/momentum/jaguar_atx/reset.c | |||
@@ -27,7 +27,7 @@ | |||
27 | void momenco_jaguar_restart(char *command) | 27 | void momenco_jaguar_restart(char *command) |
28 | { | 28 | { |
29 | /* base address of timekeeper portion of part */ | 29 | /* base address of timekeeper portion of part */ |
30 | #ifdef CONFIG_MIPS64 | 30 | #ifdef CONFIG_64BIT |
31 | void *nvram = (void*) 0xfffffffffc807000; | 31 | void *nvram = (void*) 0xfffffffffc807000; |
32 | #else | 32 | #else |
33 | void *nvram = (void*) 0xfc807000; | 33 | void *nvram = (void*) 0xfc807000; |
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c index 30462e715066..3cf1e46aa4b8 100644 --- a/arch/mips/momentum/jaguar_atx/setup.c +++ b/arch/mips/momentum/jaguar_atx/setup.c | |||
@@ -105,7 +105,7 @@ void __init bus_error_init(void) { /* nothing */ } | |||
105 | 105 | ||
106 | static __init void wire_stupidity_into_tlb(void) | 106 | static __init void wire_stupidity_into_tlb(void) |
107 | { | 107 | { |
108 | #ifdef CONFIG_MIPS32 | 108 | #ifdef CONFIG_32BIT |
109 | write_c0_wired(0); | 109 | write_c0_wired(0); |
110 | local_flush_tlb_all(); | 110 | local_flush_tlb_all(); |
111 | 111 | ||