diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-20 19:56:00 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-20 19:56:00 -0400 |
| commit | 2d87e06e7477fa1467e730087b68c2f518c0fff6 (patch) | |
| tree | ee8e45580ae0304a3f22c715c0b88b870b5774b3 /arch/powerpc/kernel/cputable.c | |
| parent | ff651516683421d773802707652207d4036244cc (diff) | |
| parent | b5594a7760fa048730db64c501cf4534df06b3b3 (diff) | |
Merge remote-tracking branch 'jwb/next' into next
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 81db9e2a8a20..87353baf21fb 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -1816,7 +1816,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 1816 | .platform = "ppc440", | 1816 | .platform = "ppc440", |
| 1817 | }, | 1817 | }, |
| 1818 | { /* 464 in APM821xx */ | 1818 | { /* 464 in APM821xx */ |
| 1819 | .pvr_mask = 0xffffff00, | 1819 | .pvr_mask = 0xfffffff0, |
| 1820 | .pvr_value = 0x12C41C80, | 1820 | .pvr_value = 0x12C41C80, |
| 1821 | .cpu_name = "APM821XX", | 1821 | .cpu_name = "APM821XX", |
| 1822 | .cpu_features = CPU_FTRS_44X, | 1822 | .cpu_features = CPU_FTRS_44X, |