diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /arch/mips/momentum/ocelot_3/prom.c | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
| download | op-kernel-dev-b0c4e148bd591629749d02a8fbc8d81c26d548cf.zip op-kernel-dev-b0c4e148bd591629749d02a8fbc8d81c26d548cf.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/momentum/ocelot_3/prom.c')
| -rw-r--r-- | arch/mips/momentum/ocelot_3/prom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/momentum/ocelot_3/prom.c b/arch/mips/momentum/ocelot_3/prom.c index c4fa9c5..9803daa 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) |
