git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
mips
/
sgi-ip27
/
ip27-memory.c
diff --git
a/arch/mips/sgi-ip27/ip27-memory.c
b/arch/mips/sgi-ip27/ip27-memory.c
index
16e5682
..
0e3d535
100644
(file)
--- a/
arch/mips/sgi-ip27/ip27-memory.c
+++ b/
arch/mips/sgi-ip27/ip27-memory.c
@@
-498,10
+498,9
@@
void __init prom_meminit(void)
}
}
-
unsigned long
__init prom_free_prom_memory(void)
+
void
__init prom_free_prom_memory(void)
{
/* We got nothing to free here ... */
- return 0;
}
extern void pagetable_init(void);