diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /arch/mips/baget | |
parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) |
Merge with Linux 2.3.49.
Diffstat (limited to 'arch/mips/baget')
-rw-r--r-- | arch/mips/baget/balo_supp.S | 3 | ||||
-rw-r--r-- | arch/mips/baget/prom/init.c | 3 | ||||
-rw-r--r-- | arch/mips/baget/setup.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/mips/baget/balo_supp.S b/arch/mips/baget/balo_supp.S index 6b79d22d3..96f2a8f50 100644 --- a/arch/mips/baget/balo_supp.S +++ b/arch/mips/baget/balo_supp.S @@ -1,10 +1,9 @@ -/* $Id$ +/* $Id: balo_supp.S,v 1.1 1999/01/17 03:49:38 ralf Exp $ * balo_supp.S: BAget Loader supplement * * Copyright (C) 1998 Gleb Raiko & Vladimir Roganov */ -#include <linux/config.h> #include <asm/asm.h> #include <asm/regdef.h> #include <asm/stackframe.h> diff --git a/arch/mips/baget/prom/init.c b/arch/mips/baget/prom/init.c index ad576f984..a87c004ec 100644 --- a/arch/mips/baget/prom/init.c +++ b/arch/mips/baget/prom/init.c @@ -3,10 +3,9 @@ * * Copyright (C) 1998 Gleb Raiko & Vladimir Roganov * - * $Id: init.c,v 1.2 1999/08/17 22:18:38 ralf Exp $ + * $Id: init.c,v 1.3 1999/10/09 00:00:57 ralf Exp $ */ #include <linux/init.h> -#include <linux/config.h> #include <asm/bootinfo.h> char arcs_cmdline[CL_SIZE]; diff --git a/arch/mips/baget/setup.c b/arch/mips/baget/setup.c index 07a7ede00..dd0a7733e 100644 --- a/arch/mips/baget/setup.c +++ b/arch/mips/baget/setup.c @@ -1,11 +1,10 @@ -/* $Id: setup.c,v 1.3 1999/08/13 17:07:26 harald Exp $ +/* $Id: setup.c,v 1.4 1999/10/09 00:00:57 ralf Exp $ * * setup.c: Baget/MIPS specific setup, including init of the feature struct. * * Copyright (C) 1998 Gleb Raiko & Vladimir Roganov * */ -#include <linux/config.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/sched.h> |