summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-02-05 01:33:01 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-02-05 01:33:01 +0000
commit222ce6477d35d0b51fe9d5fb16ada90ac3341500 (patch)
tree33dc535dde84fab2a5cd175e0bfda393d5970f42 /arch/mips/kernel
parent41f766e193858f7b5d1f9e81f50f392c1bd40f32 (diff)
Start of an attempt to unify support for GT64120 based boards.
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/proc.c4
-rw-r--r--arch/mips/kernel/setup.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 615031946..6725f1864 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -38,12 +38,12 @@ int get_cpuinfo(char *buffer)
const char *mach_baget_names[] = GROUP_BAGET_NAMES;
const char *mach_cosine_names[] = GROUP_COSINE_NAMES;
const char *mach_galileo_names[] = GROUP_GALILEO_NAMES;
- const char *mach_pmc_names[] = GROUP_PMC_NAMES;
+ const char *mach_momenco_names[] = GROUP_MOMENCO_NAMES;
const char **mach_group_to_name[] = { mach_unknown_names,
mach_jazz_names, mach_dec_names, mach_arc_names,
mach_sni_rm_names, mach_acn_names, mach_sgi_names,
mach_cobalt_names, mach_nec_ddb_names, mach_baget_names,
- mach_cosine_names, mach_galileo_names, mach_pmc_names };
+ mach_cosine_names, mach_galileo_names, mach_momenco_names };
unsigned int version = read_32bit_cp0_register(CP0_PRID);
int len;
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 5f8662bd9..ac5c909d0 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -447,7 +447,7 @@ void __init setup_arch(char **cmdline_p)
void sgi_setup(void);
void ev96100_setup(void);
void malta_setup(void);
- void cp7000_setup(void);
+ void momenco_ocelot_setup(void);
unsigned long bootmap_size;
unsigned long start_pfn, max_pfn;
@@ -497,9 +497,9 @@ void __init setup_arch(char **cmdline_p)
malta_setup();
break;
#endif
-#ifdef CONFIG_PMC_CP7000
- case MACH_GROUP_PMC:
- cp7000_setup();
+#ifdef CONFIG_MOMENCO_OCELOT
+ case MACH_GROUP_MOMENCO:
+ momenco_ocelot_setup();
break;
#endif
#ifdef CONFIG_SGI_IP22