diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /arch/mips/arc | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'arch/mips/arc')
| -rw-r--r-- | arch/mips/arc/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/arc/init.c b/arch/mips/arc/init.c index 81cf6cf74..05200cb42 100644 --- a/arch/mips/arc/init.c +++ b/arch/mips/arc/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.4 1999/10/09 00:00:57 ralf Exp $ +/* $Id: init.c,v 1.5 2000/03/07 15:45:27 ralf Exp $ * This file is subject to the terms and conditions of the GNU General Public+ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -23,7 +23,7 @@ unsigned short prom_vers, prom_rev; extern void prom_testtree(void); -int __init prom_init(int argc, char **argv, char **envp) +int __init prom_init(int argc, char **argv, char **envp, int *prom_vec) { struct linux_promblock *pb; |