diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:27:10 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:27:10 -0600 |
| commit | edacf6bb7e7e1b75f2937966a50119439ff78ccb (patch) | |
| tree | eab09f64b8261379111dc6e3607ef848ea0adc5f /arch/mips/qemu/q-mem.c | |
| parent | 862a7284980d809a583e9a34c774fab84e0a46f8 (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
| download | kernel-crypto-edacf6bb7e7e1b75f2937966a50119439ff78ccb.tar.gz kernel-crypto-edacf6bb7e7e1b75f2937966a50119439ff78ccb.tar.xz kernel-crypto-edacf6bb7e7e1b75f2937966a50119439ff78ccb.zip | |
Merge branch 'master' into 85xx
Diffstat (limited to 'arch/mips/qemu/q-mem.c')
| -rw-r--r-- | arch/mips/qemu/q-mem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/qemu/q-mem.c b/arch/mips/qemu/q-mem.c index d174fac4303..dae39b59de1 100644 --- a/arch/mips/qemu/q-mem.c +++ b/arch/mips/qemu/q-mem.c @@ -1,6 +1,5 @@ #include <linux/init.h> -unsigned long __init prom_free_prom_memory(void) +void __init prom_free_prom_memory(void) { - return 0UL; } |