To: linus, akpm
Cc: lkml
Subject: [PATCH] Sun-3 duplicates

Sun-3: Kill duplicate definitions:
  - FC_CONTROL is defined in <asm/sun3-head.h>
  - vectors[] is declared in <asm/traps.h>

---
 arch/m68k/sun3/leds.c      |    3 ---
 arch/m68k/sun3x/prom.c     |    2 --
 include/asm-m68k/sun3mmu.h |    5 ++---
 3 files changed, 2 insertions(+), 8 deletions(-)

--- linux-2.6.5-rc2/arch/m68k/sun3/leds.c	1999-09-04 22:06:41.000000000 +0200
+++ linux-m68k-2.6.5-rc2/arch/m68k/sun3/leds.c	2004-03-21 20:42:05.000000000 +0100
@@ -1,9 +1,6 @@
 #include <asm/contregs.h>
 #include <asm/sun3mmu.h>
 #include <asm/io.h>
-#include <asm/movs.h>
-
-#define FC_CONTROL 3    /* This should go somewhere else... */
 
 void sun3_leds(unsigned char byte)
 {
--- linux-2.6.5-rc2/arch/m68k/sun3x/prom.c	2003-05-05 10:30:22.000000000 +0200
+++ linux-m68k-2.6.5-rc2/arch/m68k/sun3x/prom.c	2004-03-28 12:01:44.000000000 +0200
@@ -31,8 +31,6 @@
 /* prom vector table */
 e_vector *sun3x_prom_vbr;
 
-extern e_vector vectors[256];  /* arch/m68k/kernel/traps.c */
-
 /* Handle returning to the prom */
 void sun3x_halt(void)
 {
--- linux-2.6.5-rc2/include/asm-m68k/sun3mmu.h	2003-12-23 11:31:10.000000000 +0100
+++ linux-m68k-2.6.5-rc2/include/asm-m68k/sun3mmu.h	2004-03-21 20:12:20.000000000 +0100
@@ -1,12 +1,11 @@
 /*
  * Definitions for Sun3 custom MMU.
  */
-#include <asm/movs.h>
-
 #ifndef __SUN3_MMU_H__
 #define __SUN3_MMU_H__
 
-#define FC_CONTROL 3
+#include <asm/movs.h>
+#include <asm/sun3-head.h>
 
 /* MMU characteristics. */
 #define SUN3_SEGMAPS_PER_CONTEXT	2048