summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Othieno <a.othieno@bluewin.ch>2005-10-28 00:42:56 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:32:53 +0100
commit5ef66935c1f6d412b37cf4f68281bd4fc7fca7e5 (patch)
treedfdf1058e37ef12c890719a37070ae011ab47e9a
parent4b724efdde0287d7ba616bd2badc63fca414f978 (diff)
downloadlinux-3.10-5ef66935c1f6d412b37cf4f68281bd4fc7fca7e5.tar.gz
linux-3.10-5ef66935c1f6d412b37cf4f68281bd4fc7fca7e5.tar.bz2
linux-3.10-5ef66935c1f6d412b37cf4f68281bd4fc7fca7e5.zip
prom_free_prom_memory() returns unsigned long
Some boards declare prom_free_prom_memory as a void function but the caller free_initmem() expects a return value. Fix those up and return 0 instead, just like everyone else does. Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/momentum/jaguar_atx/prom.c3
-rw-r--r--arch/mips/momentum/ocelot_3/prom.c3
-rw-r--r--arch/mips/pmc-sierra/yosemite/prom.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/mips/momentum/jaguar_atx/prom.c b/arch/mips/momentum/jaguar_atx/prom.c
index 14ae2e71358..aae7a802767 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)
#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/arch/mips/momentum/ocelot_3/prom.c b/arch/mips/momentum/ocelot_3/prom.c
index c4fa9c525fa..9803daa2a79 100644
--- a/arch/mips/momentum/ocelot_3/prom.c
+++ b/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/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index 1fb3e697948..555bfacf764 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/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)