aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/txx9/jmr3927/setup.c1
-rw-r--r--arch/mips/txx9/rbtx4927/setup.c2
-rw-r--r--arch/mips/txx9/rbtx4938/setup.c1
-rw-r--r--include/asm-mips/bootinfo.h11
-rw-r--r--include/asm-mips/txx9/generic.h1
5 files changed, 0 insertions, 16 deletions
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c
index 128a4ae3e72e..43a8dad22ef7 100644
--- 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)
366} 366}
367 367
368struct txx9_board_vec jmr3927_vec __initdata = { 368struct txx9_board_vec jmr3927_vec __initdata = {
369 .type = MACH_TOSHIBA_JMR3927,
370 .system = "Toshiba JMR_TX3927", 369 .system = "Toshiba JMR_TX3927",
371 .prom_init = jmr3927_prom_init, 370 .prom_init = jmr3927_prom_init,
372 .mem_setup = jmr3927_mem_setup, 371 .mem_setup = jmr3927_mem_setup,
diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c
index adc91c0bbb95..aba11f376a51 100644
--- 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)
428} 428}
429 429
430struct txx9_board_vec rbtx4927_vec __initdata = { 430struct txx9_board_vec rbtx4927_vec __initdata = {
431 .type = MACH_TOSHIBA_RBTX4927,
432 .system = "Toshiba RBTX4927", 431 .system = "Toshiba RBTX4927",
433 .prom_init = rbtx4927_prom_init, 432 .prom_init = rbtx4927_prom_init,
434 .mem_setup = rbtx4927_mem_setup, 433 .mem_setup = rbtx4927_mem_setup,
@@ -441,7 +440,6 @@ struct txx9_board_vec rbtx4927_vec __initdata = {
441#endif 440#endif
442}; 441};
443struct txx9_board_vec rbtx4937_vec __initdata = { 442struct txx9_board_vec rbtx4937_vec __initdata = {
444 .type = MACH_TOSHIBA_RBTX4937,
445 .system = "Toshiba RBTX4937", 443 .system = "Toshiba RBTX4937",
446 .prom_init = rbtx4927_prom_init, 444 .prom_init = rbtx4927_prom_init,
447 .mem_setup = rbtx4927_mem_setup, 445 .mem_setup = rbtx4927_mem_setup,
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index 8306ba333dda..2ef71adea827 100644
--- 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)
619} 619}
620 620
621struct txx9_board_vec rbtx4938_vec __initdata = { 621struct txx9_board_vec rbtx4938_vec __initdata = {
622 .type = MACH_TOSHIBA_RBTX4938,
623 .system = "Toshiba RBTX4938", 622 .system = "Toshiba RBTX4938",
624 .prom_init = rbtx4938_prom_init, 623 .prom_init = rbtx4938_prom_init,
625 .mem_setup = rbtx4938_mem_setup, 624 .mem_setup = rbtx4938_mem_setup,
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index e031bdff9920..c70848d4f632 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -62,17 +62,6 @@
62#define MACH_SGI_IP30 4 /* Octane, Octane2 */ 62#define MACH_SGI_IP30 4 /* Octane, Octane2 */
63 63
64/* 64/*
65 * Valid machtypes for group Toshiba
66 */
67#define MACH_PALLAS 0
68#define MACH_TOPAS 1
69#define MACH_JMR 2
70#define MACH_TOSHIBA_JMR3927 3 /* JMR-TX3927 CPU/IO board */
71#define MACH_TOSHIBA_RBTX4927 4
72#define MACH_TOSHIBA_RBTX4937 5
73#define MACH_TOSHIBA_RBTX4938 6
74
75/*
76 * Valid machtype for group LASAT 65 * Valid machtype for group LASAT
77 */ 66 */
78#define MACH_LASAT_100 0 /* Masquerade II/SP100/SP50/SP25 */ 67#define MACH_LASAT_100 0 /* Masquerade II/SP100/SP50/SP25 */
diff --git a/include/asm-mips/txx9/generic.h b/include/asm-mips/txx9/generic.h
index 6cd147764f19..715d7c8ade5c 100644
--- a/include/asm-mips/txx9/generic.h
+++ b/include/asm-mips/txx9/generic.h
@@ -22,7 +22,6 @@ extern unsigned int txx9_gbus_clock;
22 22
23struct pci_dev; 23struct pci_dev;
24struct txx9_board_vec { 24struct txx9_board_vec {
25 unsigned long type;
26 const char *system; 25 const char *system;
27 void (*prom_init)(void); 26 void (*prom_init)(void);
28 void (*mem_setup)(void); 27 void (*mem_setup)(void);