diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:28:39 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:28:39 -0600 |
| commit | 67c2b7d9d224232ee730b9c9444abed824b62e7a (patch) | |
| tree | 61a48c2e3562f8f66c04fd02691390dec96466e1 /arch/mips/sgi-ip22/ip22-mc.c | |
| parent | 49baa91d6863df480fa05eb57524a274f77fa886 (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
Merge branch 'master' into 83xx
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-mc.c')
| -rw-r--r-- | arch/mips/sgi-ip22/ip22-mc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c index b58bd522262..ddb6506d834 100644 --- a/arch/mips/sgi-ip22/ip22-mc.c +++ b/arch/mips/sgi-ip22/ip22-mc.c @@ -202,7 +202,6 @@ void __init sgimc_init(void) } void __init prom_meminit(void) {} -unsigned long __init prom_free_prom_memory(void) +void __init prom_free_prom_memory(void) { - return 0; } |