Linus, please apply.
Some updated copyright noticed and an unnecessary variable deleted.
diff -ruN -X../cludes linux-2.6.0-test1-moo/arch/v850/kernel/gbus_int.c linux-2.6.0-test1-moo-v850-20030718/arch/v850/kernel/gbus_int.c
--- linux-2.6.0-test1-moo/arch/v850/kernel/gbus_int.c 2003-07-14 13:14:39.000000000 +0900
+++ linux-2.6.0-test1-moo-v850-20030718/arch/v850/kernel/gbus_int.c 2003-07-15 19:06:36.000000000 +0900
@@ -113,9 +113,7 @@
/* Only pay attention to enabled interrupts. */
status &= enable;
if (status) {
- unsigned base_irq
- = IRQ_GBUS_INT (w * GBUS_INT_BITS_PER_WORD);
- irq = base_irq;
+ irq = IRQ_GBUS_INT (w * GBUS_INT_BITS_PER_WORD);
do {
/* There's an active interrupt in word
W, find out which one, and call its
diff -ruN -X../cludes linux-2.6.0-test1-moo/include/asm-v850/asm.h linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/asm.h
--- linux-2.6.0-test1-moo/include/asm-v850/asm.h 2003-02-25 10:45:23.000000000 +0900
+++ linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/asm.h 2003-07-15 19:06:36.000000000 +0900
@@ -1,7 +1,7 @@
/*
* include/asm-v850/asm.h -- Macros for writing assembly code
*
- * Copyright (C) 2001,02,03 NEC Corporation
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
* Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
diff -ruN -X../cludes linux-2.6.0-test1-moo/include/asm-v850/processor.h linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/processor.h
--- linux-2.6.0-test1-moo/include/asm-v850/processor.h 2003-04-21 10:53:17.000000000 +0900
+++ linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/processor.h 2003-07-15 19:06:37.000000000 +0900
@@ -1,7 +1,7 @@
/*
* include/asm-v850/processor.h
*
- * Copyright (C) 2001,02,03 NEC Corporation
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
* Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
diff -ruN -X../cludes linux-2.6.0-test1-moo/include/asm-v850/ptrace.h linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/ptrace.h
--- linux-2.6.0-test1-moo/include/asm-v850/ptrace.h 2003-04-21 10:53:17.000000000 +0900
+++ linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/ptrace.h 2003-07-15 19:06:37.000000000 +0900
@@ -1,7 +1,7 @@
/*
* include/asm-v850/ptrace.h -- Access to CPU registers
*
- * Copyright (C) 2001,02,03 NEC Corporation
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
* Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
diff -ruN -X../cludes linux-2.6.0-test1-moo/include/asm-v850/stat.h linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/stat.h
--- linux-2.6.0-test1-moo/include/asm-v850/stat.h 2003-04-08 10:15:57.000000000 +0900
+++ linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/stat.h 2003-07-15 19:06:37.000000000 +0900
@@ -1,7 +1,7 @@
/*
* include/asm-v850/stat.h -- v850 stat structure
*
- * Copyright (C) 2001,02,03 NEC Corporation
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
* Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
diff -ruN -X../cludes linux-2.6.0-test1-moo/include/asm-v850/system.h linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/system.h
--- linux-2.6.0-test1-moo/include/asm-v850/system.h 2003-04-21 10:53:17.000000000 +0900
+++ linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/system.h 2003-07-15 19:06:37.000000000 +0900
@@ -1,7 +1,7 @@
/*
* include/asm-v850/system.h -- Low-level interrupt/thread ops
*
- * Copyright (C) 2001,02,03 NEC Corporation
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
* Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Jul 23 2003 - 22:00:32 EST