diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:15 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:20 -0400 |
commit | 9de09ace8d518141a4375e1d216ab64db4377799 (patch) | |
tree | da8e7a77f4ea91eb3bb73fc6da72ecf8c99e1c16 /arch/powerpc/kernel/cputable.c | |
parent | 1beee96bae0daf7f491356777c3080cc436950f5 (diff) | |
parent | 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 (diff) |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up fixes and move base from -rc1 to -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
-rw-r--r-- | arch/powerpc/kernel/cputable.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 0b9c9135922e..03c862b6a9c4 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -711,6 +711,8 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
711 | .cpu_setup = __setup_cpu_750, | 711 | .cpu_setup = __setup_cpu_750, |
712 | .machine_check = machine_check_generic, | 712 | .machine_check = machine_check_generic, |
713 | .platform = "ppc750", | 713 | .platform = "ppc750", |
714 | .oprofile_cpu_type = "ppc/750", | ||
715 | .oprofile_type = PPC_OPROFILE_G4, | ||
714 | }, | 716 | }, |
715 | { /* 745/755 */ | 717 | { /* 745/755 */ |
716 | .pvr_mask = 0xfffff000, | 718 | .pvr_mask = 0xfffff000, |