summaryrefslogtreecommitdiff
path: root/arch/mips/pmc-sierra/yosemite/prom.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-02-20 22:13:30 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-20 22:13:30 +0300
commit5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch)
tree9b08af78085334af44414adafe0096276f8fe0ff /arch/mips/pmc-sierra/yosemite/prom.c
parente80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff)
parent7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff)
downloadlinux-5a84d159061d914c8dd4aa372ac6e9529c2be453.tar.xz
Merge ARM fixes
Diffstat (limited to 'arch/mips/pmc-sierra/yosemite/prom.c')
-rw-r--r--arch/mips/pmc-sierra/yosemite/prom.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index 9fe4973377c3..1e1685e415a4 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -132,9 +132,8 @@ void __init prom_init(void)
prom_grab_secondary();
}
-unsigned long __init prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
{
- return 0;
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)