diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/mips/baget/prom | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/baget/prom')
| -rw-r--r-- | arch/mips/baget/prom/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/baget/prom/init.c b/arch/mips/baget/prom/init.c index 52b74b088..ad576f984 100644 --- a/arch/mips/baget/prom/init.c +++ b/arch/mips/baget/prom/init.c @@ -3,7 +3,7 @@ * * Copyright (C) 1998 Gleb Raiko & Vladimir Roganov * - * $Id: init.c,v 1.1 1999/01/17 03:49:40 ralf Exp $ + * $Id: init.c,v 1.2 1999/08/17 22:18:38 ralf Exp $ */ #include <linux/init.h> #include <linux/config.h> @@ -11,7 +11,7 @@ char arcs_cmdline[CL_SIZE]; -__initfunc(int prom_init(unsigned int mem_upper)) +int __init prom_init(unsigned int mem_upper) { mips_memory_upper = mem_upper; mips_machgroup = MACH_GROUP_UNKNOWN; @@ -20,7 +20,7 @@ __initfunc(int prom_init(unsigned int mem_upper)) return 0; } -__initfunc(void prom_fixup_mem_map(unsigned long start, unsigned long end)) +void __init prom_fixup_mem_map(unsigned long start, unsigned long end) { } |