diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-30 20:01:50 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-30 20:01:50 -0400 |
| commit | ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2 (patch) | |
| tree | 6539480b50258f30af799a6ab38529d7b2d7e538 /arch/powerpc/kernel/cputable.c | |
| parent | 3d00d4ff11686895925f46265f4a78dc78196c2e (diff) | |
| parent | 48936a08b85518c22a9467a8eaac35d43af54ab4 (diff) | |
Merge commit 'kumar/next' into next
Conflicts:
arch/powerpc/sysdev/fsl_msi.c
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 9556be903e9..87aa0f3c604 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -1840,7 +1840,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 1840 | .oprofile_cpu_type = "ppc/e500mc", | 1840 | .oprofile_cpu_type = "ppc/e500mc", |
| 1841 | .oprofile_type = PPC_OPROFILE_FSL_EMB, | 1841 | .oprofile_type = PPC_OPROFILE_FSL_EMB, |
| 1842 | .cpu_setup = __setup_cpu_e500mc, | 1842 | .cpu_setup = __setup_cpu_e500mc, |
| 1843 | .machine_check = machine_check_e500, | 1843 | .machine_check = machine_check_e500mc, |
| 1844 | .platform = "ppce500mc", | 1844 | .platform = "ppce500mc", |
| 1845 | }, | 1845 | }, |
| 1846 | { /* default match */ | 1846 | { /* default match */ |