aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2008-07-13 07:04:18 -0400
committerRalf Baechle <ralf@linux-mips.org>2008-07-15 13:44:38 -0400
commit6e68665e51b9937b132a990b9ae7f04118e64688 (patch)
tree0540f8d3d4ccf71c14f64121206e12a2f4b5f9dd /include/asm-mips
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>
Diffstat (limited to 'include/asm-mips')
-rw-r--r--include/asm-mips/bootinfo.h11
-rw-r--r--include/asm-mips/txx9/generic.h1
2 files changed, 0 insertions, 12 deletions
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);