diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-08 19:51:57 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-08 19:51:57 -0500 |
| commit | 59603b9ae426e968d452f9325cdcff308573dee7 (patch) | |
| tree | f54c52cbf4874a28f88c65fce659daee20b0f41f /arch/powerpc/kernel/cputable.c | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
| parent | a11106544f33c104706ae42d27219a409b67478e (diff) | |
Merge commit 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 2fc82bac3bbc..8af4949434b2 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -1808,7 +1808,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 1808 | .icache_bsize = 64, | 1808 | .icache_bsize = 64, |
| 1809 | .dcache_bsize = 64, | 1809 | .dcache_bsize = 64, |
| 1810 | .num_pmcs = 4, | 1810 | .num_pmcs = 4, |
| 1811 | .oprofile_cpu_type = "ppc/e500", /* xxx - galak, e500mc? */ | 1811 | .oprofile_cpu_type = "ppc/e500mc", |
| 1812 | .oprofile_type = PPC_OPROFILE_FSL_EMB, | 1812 | .oprofile_type = PPC_OPROFILE_FSL_EMB, |
| 1813 | .cpu_setup = __setup_cpu_e500mc, | 1813 | .cpu_setup = __setup_cpu_e500mc, |
| 1814 | .machine_check = machine_check_e500, | 1814 | .machine_check = machine_check_e500, |