Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 03c862b6a9c4..8af4949434b2 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -697,9 +697,9 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
         },
-        {       /* 750CL */
-                .pvr_mask               = 0xfffff0f0,
-                .pvr_value              = 0x00087010,
+        {       /* 750CL (and "Broadway") */
+                .pvr_mask               = 0xfffff0e0,
+                .pvr_value              = 0x00087000,
                 .cpu_name               = "750CL",
                 .cpu_features           = CPU_FTRS_750CL,
                 .cpu_user_features      = COMMON_USER | PPC_FEATURE_PPC_LE,
@@ -1808,7 +1808,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 64,
                 .dcache_bsize           = 64,
                 .num_pmcs               = 4,
-                .oprofile_cpu_type      = "ppc/e500", /* xxx - galak, e500mc? */
+                .oprofile_cpu_type      = "ppc/e500mc",
                 .oprofile_type          = PPC_OPROFILE_FSL_EMB,
                 .cpu_setup              = __setup_cpu_e500mc,
                 .machine_check          = machine_check_e500,