Commit 89a8bf17 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[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>
parent f21618ed
#include <asm/contregs.h> #include <asm/contregs.h>
#include <asm/sun3mmu.h> #include <asm/sun3mmu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/movs.h>
#define FC_CONTROL 3 /* This should go somewhere else... */
void sun3_leds(unsigned char byte) void sun3_leds(unsigned char byte)
{ {
......
...@@ -31,8 +31,6 @@ struct linux_romvec *romvec; ...@@ -31,8 +31,6 @@ struct linux_romvec *romvec;
/* prom vector table */ /* prom vector table */
e_vector *sun3x_prom_vbr; e_vector *sun3x_prom_vbr;
extern e_vector vectors[256]; /* arch/m68k/kernel/traps.c */
/* Handle returning to the prom */ /* Handle returning to the prom */
void sun3x_halt(void) void sun3x_halt(void)
{ {
......
/* /*
* Definitions for Sun3 custom MMU. * Definitions for Sun3 custom MMU.
*/ */
#include <asm/movs.h>
#ifndef __SUN3_MMU_H__ #ifndef __SUN3_MMU_H__
#define __SUN3_MMU_H__ #define __SUN3_MMU_H__
#define FC_CONTROL 3 #include <asm/movs.h>
#include <asm/sun3-head.h>
/* MMU characteristics. */ /* MMU characteristics. */
#define SUN3_SEGMAPS_PER_CONTEXT 2048 #define SUN3_SEGMAPS_PER_CONTEXT 2048
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment