linux-mips
[Top] [All Lists]

[PATCH][5/5][MIPS] remove machtype for group Toshiba

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH][5/5][MIPS] remove machtype for group Toshiba
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Sun, 13 Jul 2008 20:04:18 +0900
Cc: yoichi_yuasa@tripeaks.co.jp, Atsushi Nemoto <anemo@mba.ocn.ne.jp>, linux-mips <linux-mips@linux-mips.org>
In-reply-to: <20080713200213.6cea0cca.yoichi_yuasa@tripeaks.co.jp>
Organization: TriPeaks Corporation
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20080713195155.08c4285d.yoichi_yuasa@tripeaks.co.jp> <20080713195408.f3878fb2.yoichi_yuasa@tripeaks.co.jp> <20080713200104.02e6d163.yoichi_yuasa@tripeaks.co.jp> <20080713200213.6cea0cca.yoichi_yuasa@tripeaks.co.jp>
Sender: linux-mips-bounce@linux-mips.org
Remove machtype for group Toshiba.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X /home/yuasa/Memo/dontdiff 
linux-orig/arch/mips/txx9/jmr3927/setup.c linux/arch/mips/txx9/jmr3927/setup.c
--- linux-orig/arch/mips/txx9/jmr3927/setup.c   2008-07-13 15:59:38.884682499 
+0900
+++ linux/arch/mips/txx9/jmr3927/setup.c        2008-07-13 17:43:27.789224724 
+0900
@@ -366,7 +366,6 @@ static void __init jmr3927_device_init(v
 }
 
 struct txx9_board_vec jmr3927_vec __initdata = {
-       .type = MACH_TOSHIBA_JMR3927,
        .system = "Toshiba JMR_TX3927",
        .prom_init = jmr3927_prom_init,
        .mem_setup = jmr3927_mem_setup,
diff -pruN -X /home/yuasa/Memo/dontdiff 
linux-orig/arch/mips/txx9/rbtx4927/setup.c linux/arch/mips/txx9/rbtx4927/setup.c
--- linux-orig/arch/mips/txx9/rbtx4927/setup.c  2008-07-13 17:40:52.452372581 
+0900
+++ linux/arch/mips/txx9/rbtx4927/setup.c       2008-07-13 17:43:39.193874641 
+0900
@@ -428,7 +428,6 @@ static void __init rbtx4927_device_init(
 }
 
 struct txx9_board_vec rbtx4927_vec __initdata = {
-       .type = MACH_TOSHIBA_RBTX4927,
        .system = "Toshiba RBTX4927",
        .prom_init = rbtx4927_prom_init,
        .mem_setup = rbtx4927_mem_setup,
@@ -441,7 +440,6 @@ struct txx9_board_vec rbtx4927_vec __ini
 #endif
 };
 struct txx9_board_vec rbtx4937_vec __initdata = {
-       .type = MACH_TOSHIBA_RBTX4937,
        .system = "Toshiba RBTX4937",
        .prom_init = rbtx4927_prom_init,
        .mem_setup = rbtx4927_mem_setup,
diff -pruN -X /home/yuasa/Memo/dontdiff 
linux-orig/arch/mips/txx9/rbtx4938/setup.c linux/arch/mips/txx9/rbtx4938/setup.c
--- linux-orig/arch/mips/txx9/rbtx4938/setup.c  2008-07-13 15:59:38.888682728 
+0900
+++ linux/arch/mips/txx9/rbtx4938/setup.c       2008-07-13 17:43:47.814365892 
+0900
@@ -619,7 +619,6 @@ static void __init rbtx4938_device_init(
 }
 
 struct txx9_board_vec rbtx4938_vec __initdata = {
-       .type = MACH_TOSHIBA_RBTX4938,
        .system = "Toshiba RBTX4938",
        .prom_init = rbtx4938_prom_init,
        .mem_setup = rbtx4938_mem_setup,
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/include/asm-mips/bootinfo.h 
linux/include/asm-mips/bootinfo.h
--- linux-orig/include/asm-mips/bootinfo.h      2008-07-13 15:59:46.073092146 
+0900
+++ linux/include/asm-mips/bootinfo.h   2008-07-13 17:44:27.320617224 +0900
@@ -62,17 +62,6 @@
 #define  MACH_SGI_IP30         4       /* Octane, Octane2              */
 
 /*
- * Valid machtypes for group Toshiba
- */
-#define  MACH_PALLAS           0
-#define  MACH_TOPAS            1
-#define  MACH_JMR              2
-#define  MACH_TOSHIBA_JMR3927  3       /* JMR-TX3927 CPU/IO board */
-#define  MACH_TOSHIBA_RBTX4927 4
-#define  MACH_TOSHIBA_RBTX4937 5
-#define  MACH_TOSHIBA_RBTX4938 6
-
-/*
  * Valid machtype for group LASAT
  */
 #define  MACH_LASAT_100                0       /* Masquerade 
II/SP100/SP50/SP25 */
diff -pruN -X /home/yuasa/Memo/dontdiff 
linux-orig/include/asm-mips/txx9/generic.h linux/include/asm-mips/txx9/generic.h
--- linux-orig/include/asm-mips/txx9/generic.h  2008-07-13 15:59:46.285104227 
+0900
+++ linux/include/asm-mips/txx9/generic.h       2008-07-13 17:44:15.759958419 
+0900
@@ -22,7 +22,6 @@ extern unsigned int txx9_gbus_clock;
 
 struct pci_dev;
 struct txx9_board_vec {
-       unsigned long type;
        const char *system;
        void (*prom_init)(void);
        void (*mem_setup)(void);

<Prev in Thread] Current Thread [Next in Thread>