aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2008-07-13 20:04:18 +0900
committerRalf Baechle <ralf@linux-mips.org>2008-07-15 18:44:38 +0100
commit6e68665e51b9937b132a990b9ae7f04118e64688 (patch)
tree0540f8d3d4ccf71c14f64121206e12a2f4b5f9dd
parentb6c4053610f04011bc0ecbc5a0417afe169b2693 (diff)
[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>
-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 128a4ae3e72..43a8dad22ef 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)
}
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 adc91c0bbb9..aba11f376a5 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)
}
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 8306ba333dd..2ef71adea82 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)
}
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 e031bdff992..c70848d4f63 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -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 --git a/include/asm-mips/txx9/generic.h b/include/asm-mips/txx9/generic.h
index 6cd147764f1..715d7c8ade5 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;
struct pci_dev;
struct txx9_board_vec {
- unsigned long type;
const char *system;
void (*prom_init)(void);
void (*mem_setup)(void);