From 0b9520475e293757535fff709bf9c6d43f6a7600 Mon Sep 17 00:00:00 2001 From: Arthur Othieno Date: Fri, 28 Oct 2005 00:42:56 -0400 Subject: [PATCH] --- yaml --- r: 11293 b: refs/heads/master c: 5ef66935c1f6d412b37cf4f68281bd4fc7fca7e5 h: refs/heads/master i: 11291: 1e229ecbe756b2af774a279022e0460423190dd6 v: v3 --- [refs] | 2 +- trunk/arch/mips/momentum/jaguar_atx/prom.c | 3 ++- trunk/arch/mips/momentum/ocelot_3/prom.c | 3 ++- trunk/arch/mips/pmc-sierra/yosemite/prom.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e962efe12496..d92145c00e32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b724efdde0287d7ba616bd2badc63fca414f978 +refs/heads/master: 5ef66935c1f6d412b37cf4f68281bd4fc7fca7e5 diff --git a/trunk/arch/mips/momentum/jaguar_atx/prom.c b/trunk/arch/mips/momentum/jaguar_atx/prom.c index 14ae2e713585..aae7a802767a 100644 --- a/trunk/arch/mips/momentum/jaguar_atx/prom.c +++ b/trunk/arch/mips/momentum/jaguar_atx/prom.c @@ -236,8 +236,9 @@ void __init prom_init(void) #endif } -void __init prom_free_prom_memory(void) +unsigned long __init prom_free_prom_memory(void) { + return 0; } void __init prom_fixup_mem_map(unsigned long start, unsigned long end) diff --git a/trunk/arch/mips/momentum/ocelot_3/prom.c b/trunk/arch/mips/momentum/ocelot_3/prom.c index c4fa9c525faa..9803daa2a792 100644 --- a/trunk/arch/mips/momentum/ocelot_3/prom.c +++ b/trunk/arch/mips/momentum/ocelot_3/prom.c @@ -239,8 +239,9 @@ void __init prom_init(void) #endif } -void __init prom_free_prom_memory(void) +unsigned long __init prom_free_prom_memory(void) { + return 0; } void __init prom_fixup_mem_map(unsigned long start, unsigned long end) diff --git a/trunk/arch/mips/pmc-sierra/yosemite/prom.c b/trunk/arch/mips/pmc-sierra/yosemite/prom.c index 1fb3e697948d..555bfacf7647 100644 --- a/trunk/arch/mips/pmc-sierra/yosemite/prom.c +++ b/trunk/arch/mips/pmc-sierra/yosemite/prom.c @@ -132,8 +132,9 @@ void __init prom_init(void) prom_grab_secondary(); } -void __init prom_free_prom_memory(void) +unsigned long __init prom_free_prom_memory(void) { + return 0; } void __init prom_fixup_mem_map(unsigned long start, unsigned long end)