[MIPS] remove machtype for group Toshiba

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c
index 128a4ae3e72eb67f35a4ac7abe1debaab68d1f73..43a8dad22ef7eefbd7c4d76228eb56da6104094d 100644 (file)
--- a/arch/mips/txx9/jmr3927/setup.c
+++ b/arch/mips/txx9/jmr3927/setup.c
@@ -366,7 +366,6 @@ static void __init jmr3927_device_init(void)
 }
 
 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 --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c
index adc91c0bbb958b8e80d90a104f08c8453eb57496..aba11f376a51cbde54b6300f92a3e9835344e072 100644 (file)
--- a/arch/mips/txx9/rbtx4927/setup.c
+++ b/arch/mips/txx9/rbtx4927/setup.c
@@ -428,7 +428,6 @@ static void __init rbtx4927_device_init(void)
 }
 
 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 __initdata = {
 #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 --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index 8306ba333ddaf86d2160080fa7c549bef9602b8d..2ef71adea827c668f8be78cabc2c007671e76ebb 100644 (file)
--- a/arch/mips/txx9/rbtx4938/setup.c
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -619,7 +619,6 @@ static void __init rbtx4938_device_init(void)
 }
 
 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 --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index e031bdff9920b81c54dde6afa52d743f229cbc14..c70848d4f6320d1750af33ff70138cd0fba1d42a 100644 (file)
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -61,17 +61,6 @@
 #define  MACH_SGI_IP32         3       /* O2                           */
 #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
  */

diff --git a/include/asm-mips/txx9/generic.h b/include/asm-mips/txx9/generic.h
index 6cd147764f19e6bd3d4dcf0ab75a8f8da6c1f72d..715d7c8ade5c4869b62817913217d2be9070c50a 100644 (file)
--- a/include/asm-mips/txx9/generic.h
+++ b/include/asm-mips/txx9/generic.h
@@ -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);