diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-18 09:34:38 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-18 09:34:38 +1100 |
| commit | efd0f0f385da6ee6d1a22cfe1ac94607ebe2a292 (patch) | |
| tree | 6ba1a89db2eb68046c238a7fca9bae4f72d92874 /arch/powerpc/sysdev | |
| parent | 3bffb6529cf10d48a97ac0d6d789986894c25c37 (diff) | |
| parent | c7b66698122796623f1838c0ee6a8e12ec832468 (diff) | |
| download | op-kernel-dev-efd0f0f385da6ee6d1a22cfe1ac94607ebe2a292.zip op-kernel-dev-efd0f0f385da6ee6d1a22cfe1ac94607ebe2a292.tar.gz | |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/ppc4xx_soc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_soc.c b/arch/powerpc/sysdev/ppc4xx_soc.c index 5b32adc..5c01435 100644 --- a/arch/powerpc/sysdev/ppc4xx_soc.c +++ b/arch/powerpc/sysdev/ppc4xx_soc.c @@ -174,7 +174,8 @@ static int __init ppc4xx_l2c_probe(void) | L2C_CFG_CPIM | L2C_CFG_TPIM | L2C_CFG_LIM | L2C_CFG_SMCM; /* Check for 460EX/GT special handling */ - if (of_device_is_compatible(np, "ibm,l2-cache-460ex")) + if (of_device_is_compatible(np, "ibm,l2-cache-460ex") || + of_device_is_compatible(np, "ibm,l2-cache-460gt")) r |= L2C_CFG_RDBW; mtdcr(dcrbase_l2c + DCRN_L2C0_CFG, r); |
