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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
mips
/
mips-boards
/
generic
/
memory.c
diff --git
a/arch/mips/mips-boards/generic/memory.c
b/arch/mips/mips-boards/generic/memory.c
index
2c5c27c
..
5e443bb
100644
(file)
--- a/
arch/mips/mips-boards/generic/memory.c
+++ b/
arch/mips/mips-boards/generic/memory.c
@@
-37,7
+37,7
@@
enum yamon_memtypes {
yamon_prom,
yamon_free,
};
yamon_prom,
yamon_free,
};
-struct prom_pmemblock mdesc[PROM_MAX_PMEMBLOCKS];
+st
atic st
ruct prom_pmemblock mdesc[PROM_MAX_PMEMBLOCKS];
#ifdef DEBUG
static char *mtypes[3] = {
#ifdef DEBUG
static char *mtypes[3] = {
@@
-50,7
+50,7
@@
static char *mtypes[3] = {
/* determined physical memory size, not overridden by command line args */
unsigned long physical_memsize = 0L;
/* determined physical memory size, not overridden by command line args */
unsigned long physical_memsize = 0L;
-struct prom_pmemblock * __init prom_getmdesc(void)
+st
atic st
ruct prom_pmemblock * __init prom_getmdesc(void)
{
char *memsize_str;
unsigned int memsize;
{
char *memsize_str;
unsigned int memsize;
@@
-169,7
+169,6
@@
void __init prom_meminit(void)
void __init prom_free_prom_memory(void)
{
void __init prom_free_prom_memory(void)
{
-#if 0 /* for now ... */
unsigned long addr;
int i;
unsigned long addr;
int i;
@@
-181,5
+180,4
@@
void __init prom_free_prom_memory(void)
free_init_pages("prom memory",
addr, addr + boot_mem_map.map[i].size);
}
free_init_pages("prom memory",
addr, addr + boot_mem_map.map[i].size);
}
-#endif
}
}