diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-02-07 00:30:38 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-02-07 00:30:38 +0000 |
| commit | 1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f (patch) | |
| tree | fa63b4c1bbd775252f71d05fef4de6a904eb4448 /arch/mips/momentum/ocelot_3/prom.c | |
| parent | 87f440e70e07dace7db130f2f9fcea3f132aad8f (diff) | |
| parent | dda2ac15d23b38e4335e858848aa8c9a6710304f (diff) | |
| download | op-kernel-dev-1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f.zip op-kernel-dev-1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f.tar.gz | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/momentum/ocelot_3/prom.c')
| -rw-r--r-- | arch/mips/momentum/ocelot_3/prom.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/momentum/ocelot_3/prom.c b/arch/mips/momentum/ocelot_3/prom.c index 6ce9b7f..8e02df6 100644 --- a/arch/mips/momentum/ocelot_3/prom.c +++ b/arch/mips/momentum/ocelot_3/prom.c @@ -180,9 +180,8 @@ void __init prom_init(void) #endif } -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) |
