diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-07 12:54:08 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-07 12:54:08 +1000 |
| commit | ae6e59caefd8d4097ccb096c95df95ec7e52fe88 (patch) | |
| tree | f72b77d41c9f5a3b18fb52e505d60dba2ad913a5 /arch/powerpc/boot/dts/tqm8560.dts | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
| parent | f379188958ae8af30105eb1f27d0e0abf6a51558 (diff) | |
Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/boot/dts/tqm8560.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/tqm8560.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts index 649e2e57626..feff915e049 100644 --- a/arch/powerpc/boot/dts/tqm8560.dts +++ b/arch/powerpc/boot/dts/tqm8560.dts @@ -60,14 +60,14 @@ compatible = "fsl,mpc8560-immr", "simple-bus"; memory-controller@2000 { - compatible = "fsl,8540-memory-controller"; + compatible = "fsl,mpc8540-memory-controller"; reg = <0x2000 0x1000>; interrupt-parent = <&mpic>; interrupts = <18 2>; }; L2: l2-cache-controller@20000 { - compatible = "fsl,8540-l2-cache-controller"; + compatible = "fsl,mpc8540-l2-cache-controller"; reg = <0x20000 0x1000>; cache-line-size = <32>; cache-size = <0x40000>; // L2, 256K |