diff options
Diffstat (limited to 'arch/mips/fw/arc/identify.c')
-rw-r--r-- | arch/mips/fw/arc/identify.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c index 28dfd2e2989a..0ce9acf10c39 100644 --- a/arch/mips/fw/arc/identify.c +++ b/arch/mips/fw/arc/identify.c | |||
@@ -22,7 +22,6 @@ | |||
22 | struct smatch { | 22 | struct smatch { |
23 | char *arcname; | 23 | char *arcname; |
24 | char *liname; | 24 | char *liname; |
25 | int type; | ||
26 | int flags; | 25 | int flags; |
27 | }; | 26 | }; |
28 | 27 | ||
@@ -30,42 +29,38 @@ static struct smatch mach_table[] = { | |||
30 | { | 29 | { |
31 | .arcname = "SGI-IP22", | 30 | .arcname = "SGI-IP22", |
32 | .liname = "SGI Indy", | 31 | .liname = "SGI Indy", |
33 | .type = MACH_SGI_IP22, | ||
34 | .flags = PROM_FLAG_ARCS, | 32 | .flags = PROM_FLAG_ARCS, |
35 | }, { | 33 | }, { |
36 | .arcname = "SGI-IP27", | 34 | .arcname = "SGI-IP27", |
37 | .liname = "SGI Origin", | 35 | .liname = "SGI Origin", |
38 | .type = MACH_SGI_IP27, | ||
39 | .flags = PROM_FLAG_ARCS, | 36 | .flags = PROM_FLAG_ARCS, |
40 | }, { | 37 | }, { |
41 | .arcname = "SGI-IP28", | 38 | .arcname = "SGI-IP28", |
42 | .liname = "SGI IP28", | 39 | .liname = "SGI IP28", |
43 | .type = MACH_SGI_IP28, | ||
44 | .flags = PROM_FLAG_ARCS, | 40 | .flags = PROM_FLAG_ARCS, |
45 | }, { | 41 | }, { |
46 | .arcname = "SGI-IP30", | 42 | .arcname = "SGI-IP30", |
47 | .liname = "SGI Octane", | 43 | .liname = "SGI Octane", |
48 | .type = MACH_SGI_IP30, | ||
49 | .flags = PROM_FLAG_ARCS, | 44 | .flags = PROM_FLAG_ARCS, |
50 | }, { | 45 | }, { |
51 | .arcname = "SGI-IP32", | 46 | .arcname = "SGI-IP32", |
52 | .liname = "SGI O2", | 47 | .liname = "SGI O2", |
53 | .type = MACH_SGI_IP32, | ||
54 | .flags = PROM_FLAG_ARCS, | 48 | .flags = PROM_FLAG_ARCS, |
55 | }, { | 49 | }, { |
56 | .arcname = "Microsoft-Jazz", | 50 | .arcname = "Microsoft-Jazz", |
57 | .liname = "Jazz MIPS_Magnum_4000", | 51 | .liname = "Jazz MIPS_Magnum_4000", |
58 | .type = MACH_MIPS_MAGNUM_4000, | ||
59 | .flags = 0, | 52 | .flags = 0, |
60 | }, { | 53 | }, { |
61 | .arcname = "PICA-61", | 54 | .arcname = "PICA-61", |
62 | .liname = "Jazz Acer_PICA_61", | 55 | .liname = "Jazz Acer_PICA_61", |
63 | .type = MACH_ACER_PICA_61, | ||
64 | .flags = 0, | 56 | .flags = 0, |
65 | }, { | 57 | }, { |
66 | .arcname = "RM200PCI", | 58 | .arcname = "RM200PCI", |
67 | .liname = "SNI RM200_PCI", | 59 | .liname = "SNI RM200_PCI", |
68 | .type = MACH_SNI_RM200_PCI, | 60 | .flags = PROM_FLAG_DONT_FREE_TEMP, |
61 | }, { | ||
62 | .arcname = "RM200PCI-R5K", | ||
63 | .liname = "SNI RM200_PCI-R5K", | ||
69 | .flags = PROM_FLAG_DONT_FREE_TEMP, | 64 | .flags = PROM_FLAG_DONT_FREE_TEMP, |
70 | } | 65 | } |
71 | }; | 66 | }; |
@@ -116,6 +111,5 @@ void __init prom_identify_arch(void) | |||
116 | mach = string_to_mach(iname); | 111 | mach = string_to_mach(iname); |
117 | system_type = mach->liname; | 112 | system_type = mach->liname; |
118 | 113 | ||
119 | mips_machtype = mach->type; | ||
120 | prom_flags = mach->flags; | 114 | prom_flags = mach->flags; |
121 | } | 115 | } |