diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
| commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
| tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /arch/sparc | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/rtrap.S | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/sparc_ksyms.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c index a6fd32fa4..f2aa6cae4 100644 --- a/arch/sparc/kernel/irq.c +++ b/arch/sparc/kernel/irq.c @@ -1,4 +1,4 @@ -/* $Id: irq.c,v 1.105 2000/07/26 01:04:02 davem Exp $ +/* $Id: irq.c,v 1.106 2000/08/05 10:48:40 davem Exp $ * arch/sparc/kernel/irq.c: Interrupt request handling routines. On the * Sparc the IRQ's are basically 'cast in stone' * and you are supposed to probe the prom's device diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S index c44040bde..b4b0b5f7b 100644 --- a/arch/sparc/kernel/rtrap.S +++ b/arch/sparc/kernel/rtrap.S @@ -1,4 +1,4 @@ -/* $Id: rtrap.S,v 1.54 2000/02/09 11:15:03 davem Exp $ +/* $Id: rtrap.S,v 1.55 2000/08/05 10:48:40 davem Exp $ * rtrap.S: Return from Sparc trap low-level code. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index 37c276c7f..e05b20f4e 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c @@ -1,4 +1,4 @@ -/* $Id: sparc_ksyms.c,v 1.101 2000/07/12 00:25:32 anton Exp $ +/* $Id: sparc_ksyms.c,v 1.102 2000/08/05 10:48:40 davem Exp $ * arch/sparc/kernel/ksyms.c: Sparc specific ksyms support. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |