aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorDaniel Laird <daniel.j.laird@nxp.com>2008-03-06 04:07:18 -0500
committerRalf Baechle <ralf@linux-mips.org>2008-04-28 12:14:26 -0400
commita92b05880d261e9017ef8e7d5b6b01e0e5aa991d (patch)
tree663109c57e75dd2183507818a035c99ab53fff25 /arch/mips/kernel
parent389310e2b0c195f176e7d4be788bc245e9102412 (diff)
[MIPS] Move arch/mips/philips to arch/mips/nxp
Signed-off-by: daniel.j.laird <daniel.j.laird@nxp.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/cpu-probe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index a742a967169a..335a6ae3d594 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -790,7 +790,7 @@ static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c)
790 } 790 }
791} 791}
792 792
793static inline void cpu_probe_philips(struct cpuinfo_mips *c) 793static inline void cpu_probe_nxp(struct cpuinfo_mips *c)
794{ 794{
795 decode_configs(c); 795 decode_configs(c);
796 switch (c->processor_id & 0xff00) { 796 switch (c->processor_id & 0xff00) {
@@ -799,7 +799,7 @@ static inline void cpu_probe_philips(struct cpuinfo_mips *c)
799 c->isa_level = MIPS_CPU_ISA_M32R1; 799 c->isa_level = MIPS_CPU_ISA_M32R1;
800 break; 800 break;
801 default: 801 default:
802 panic("Unknown Philips Core!"); /* REVISIT: die? */ 802 panic("Unknown NXP Core!"); /* REVISIT: die? */
803 break; 803 break;
804 } 804 }
805} 805}
@@ -938,8 +938,8 @@ __cpuinit void cpu_probe(void)
938 case PRID_COMP_SANDCRAFT: 938 case PRID_COMP_SANDCRAFT:
939 cpu_probe_sandcraft(c); 939 cpu_probe_sandcraft(c);
940 break; 940 break;
941 case PRID_COMP_PHILIPS: 941 case PRID_COMP_NXP:
942 cpu_probe_philips(c); 942 cpu_probe_nxp(c);
943 break; 943 break;
944 default: 944 default:
945 c->cputype = CPU_UNKNOWN; 945 c->cputype = CPU_UNKNOWN;