[PATCH] Remove <asm-v850/setup.h>

<asm-v850/setup.h> is not correct, and not used, so remove it.

diff --git a/arch/v850/kernel/process.c b/arch/v850/kernel/process.c
index 6329112750e90b23104707c2d4a539b01abdc532..5c29ae51a303c9df749a11724dc45e51f98f3e50 100644 (file)
--- a/arch/v850/kernel/process.c
+++ b/arch/v850/kernel/process.c
@@ -28,7 +28,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/setup.h>
 #include <asm/pgtable.h>
 
 extern void ret_from_fork (void);

diff --git a/arch/v850/kernel/v850_ksyms.c b/arch/v850/kernel/v850_ksyms.c
index 74bf9ace4c7e91aa65f43f0bc7b7ee57e8a83c10..2336da438b0d9051f23d67ec0e42a26f031fc8ed 100644 (file)
--- a/arch/v850/kernel/v850_ksyms.c
+++ b/arch/v850/kernel/v850_ksyms.c
@@ -9,7 +9,6 @@
 #include <linux/interrupt.h>
 #include <linux/config.h>
 
-#include <asm/setup.h>
 #include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>

diff --git a/include/asm-v850/cacheflush.h b/include/asm-v850/cacheflush.h
index de27e98490f8da47812322c6de94d746c9b960cb..e2c616a328048eacd87e5e32dffb51605dd59a68 100644 (file)
--- a/include/asm-v850/cacheflush.h
+++ b/include/asm-v850/cacheflush.h
@@ -17,7 +17,6 @@
 /* Somebody depends on this; sigh...  */
 #include <linux/mm.h>
 
-#include <asm/setup.h>
 #include <asm/machdep.h>
 
 

diff --git a/include/asm-v850/setup.h b/include/asm-v850/setup.h
deleted file mode 100644 (file)
index 9dff7e5..0000000
--- a/include/asm-v850/setup.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * include/asm-v850/setup.h
- *
- *  Copyright (C) 2001  NEC Corporation
- *  Copyright (C) 2001  Miles Bader <miles@gnu.org>
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License.  See the file COPYING in the main directory of this
- * archive for more details.
- *
- * Written by Miles Bader <miles@gnu.org>
- */
-
-#ifndef __V850_SETUP_H__
-#define __V850_SETUP_H__
-
-/* Linux/v850 platforms.  This corresponds roughly to what the outside
-   the CPU looks like.  */
-#define MACH_SIM       1       /* GDB architectural simulator */
-
-/* v850 cpu architectures.  This is what a user-program would be
-   concerned with.  */
-#define CPU_ARCH_V850E 1
-#define CPU_ARCH_V850E2        2
-
-/* v850 cpu `cores'.  These are system-level extensions to the basic CPU,
-   defining such things as interrupt-handling.  */
-#define CPU_CORE_NB85E 1
-#define CPU_CORE_NB85ET        2
-#define CPU_CORE_NU85E 3
-#define CPU_CORE_NU85ET        4
-
-/* Specific v850 cpu chips.  These each incorporate a `core', and add
-   varions peripheral services.  */
-#define CPU_CHIP_MA1   1
-
-#endif /* __V850_SETUP_H__ */

diff --git a/include/asm-v850/tlbflush.h b/include/asm-v850/tlbflush.h
index b7f75f4cc485bddd84c43265d47a6d40bcde481b..501e4498172c02e274ece2eb57a10126f1a5a47a 100644 (file)
--- a/include/asm-v850/tlbflush.h
+++ b/include/asm-v850/tlbflush.h
@@ -1,8 +1,8 @@
 /*
  * include/asm-v850/tlbflush.h
  *
- *  Copyright (C) 2001,02  NEC Corporation
- *  Copyright (C) 2001,02  Miles Bader <miles@gnu.org>
+ *  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
  * Public License.  See the file COPYING in the main directory of this
@@ -14,7 +14,6 @@
 #ifndef __V850_TLBFLUSH_H__
 #define __V850_TLBFLUSH_H__
 
-#include <asm/setup.h>
 #include <asm/machdep.h>