projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning
[openwrt.git]
/
target
/
linux
/
adm5120-2.6
/
files
/
arch
/
mips
/
adm5120
/
memory.c
diff --git
a/target/linux/adm5120-2.6/files/arch/mips/adm5120/memory.c
b/target/linux/adm5120-2.6/files/arch/mips/adm5120/memory.c
index
726c31d
..
e5c7f0c
100644
(file)
--- a/
target/linux/adm5120-2.6/files/arch/mips/adm5120/memory.c
+++ b/
target/linux/adm5120-2.6/files/arch/mips/adm5120/memory.c
@@
-83,7
+83,7
@@
struct prom_pmemblock * __init prom_getmdesc(void)
ptr = strstr(cmdline, "memsize=");
if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
ptr = strstr(ptr, " memsize=");
ptr = strstr(cmdline, "memsize=");
if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
ptr = strstr(ptr, " memsize=");
-
+
if (ptr)
memsize = memparse(ptr + 8, &ptr);
else
if (ptr)
memsize = memparse(ptr + 8, &ptr);
else
@@
-131,5
+131,5
@@
void __init prom_meminit(void)
unsigned long __init prom_free_prom_memory(void)
{
/* We do not have to prom memory to free */
unsigned long __init prom_free_prom_memory(void)
{
/* We do not have to prom memory to free */
- return;
+ return
0
;
}
}
This page took
0.019708 seconds
and
4
git commands to generate.