diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /arch/sparc/prom | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'arch/sparc/prom')
| -rw-r--r-- | arch/sparc/prom/bootstr.c | 3 | ||||
| -rw-r--r-- | arch/sparc/prom/console.c | 3 | ||||
| -rw-r--r-- | arch/sparc/prom/printf.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/sparc/prom/bootstr.c b/arch/sparc/prom/bootstr.c index a4a040ca2..1530c80c2 100644 --- a/arch/sparc/prom/bootstr.c +++ b/arch/sparc/prom/bootstr.c @@ -1,10 +1,9 @@ -/* $Id: bootstr.c,v 1.19 2000/01/29 01:09:11 anton Exp $ +/* $Id: bootstr.c,v 1.20 2000/02/08 20:24:23 davem Exp $ * bootstr.c: Boot string/argument acquisition from the PROM. * * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) */ -#include <linux/config.h> #include <linux/string.h> #include <asm/oplib.h> #include <asm/sun4prom.h> diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c index 2305dc858..c2b857459 100644 --- a/arch/sparc/prom/console.c +++ b/arch/sparc/prom/console.c @@ -1,4 +1,4 @@ -/* $Id: console.c,v 1.21 2000/01/29 01:09:12 anton Exp $ +/* $Id: console.c,v 1.22 2000/02/08 20:24:23 davem Exp $ * console.c: Routines that deal with sending and receiving IO * to/from the current console device using the PROM. * @@ -6,7 +6,6 @@ * Copyright (C) 1998 Pete Zaitcev <zaitcev@metabyte.com> */ -#include <linux/config.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/sched.h> diff --git a/arch/sparc/prom/printf.c b/arch/sparc/prom/printf.c index 24ac381a8..331a2d00b 100644 --- a/arch/sparc/prom/printf.c +++ b/arch/sparc/prom/printf.c @@ -1,4 +1,4 @@ -/* $Id: printf.c,v 1.6 2000/01/29 01:09:12 anton Exp $ +/* $Id: printf.c,v 1.7 2000/02/08 20:24:23 davem Exp $ * printf.c: Internal prom library printf facility. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -8,7 +8,6 @@ * about or use it! It's simple and smelly anyway.... */ -#include <linux/config.h> #include <linux/kernel.h> #include <asm/openprom.h> |