diff options
Diffstat (limited to 'arch/mips/momentum/jaguar_atx')
-rw-r--r-- | arch/mips/momentum/jaguar_atx/prom.c | 3 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/setup.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/mips/momentum/jaguar_atx/prom.c b/arch/mips/momentum/jaguar_atx/prom.c index 14ae2e713585..aae7a802767a 100644 --- a/arch/mips/momentum/jaguar_atx/prom.c +++ b/arch/mips/momentum/jaguar_atx/prom.c | |||
@@ -236,8 +236,9 @@ void __init prom_init(void) | |||
236 | #endif | 236 | #endif |
237 | } | 237 | } |
238 | 238 | ||
239 | void __init prom_free_prom_memory(void) | 239 | unsigned long __init prom_free_prom_memory(void) |
240 | { | 240 | { |
241 | return 0; | ||
241 | } | 242 | } |
242 | 243 | ||
243 | void __init prom_fixup_mem_map(unsigned long start, unsigned long end) | 244 | void __init prom_fixup_mem_map(unsigned long start, unsigned long end) |
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c index 90288cf2b1e0..768bf4406452 100644 --- a/arch/mips/momentum/jaguar_atx/setup.c +++ b/arch/mips/momentum/jaguar_atx/setup.c | |||
@@ -351,7 +351,7 @@ static __init int __init ja_pci_init(void) | |||
351 | 351 | ||
352 | arch_initcall(ja_pci_init); | 352 | arch_initcall(ja_pci_init); |
353 | 353 | ||
354 | static int __init momenco_jaguar_atx_setup(void) | 354 | void __init plat_setup(void) |
355 | { | 355 | { |
356 | unsigned int tmpword; | 356 | unsigned int tmpword; |
357 | 357 | ||
@@ -467,8 +467,4 @@ static int __init momenco_jaguar_atx_setup(void) | |||
467 | 467 | ||
468 | } | 468 | } |
469 | #endif | 469 | #endif |
470 | |||
471 | return 0; | ||
472 | } | 470 | } |
473 | |||
474 | early_initcall(momenco_jaguar_atx_setup); | ||