aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/lite5200.dts
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-10-27 18:56:18 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-10-27 18:56:18 -0400
commit40578fca24e7f777f3da7a693b030ae28ef7e486 (patch)
treeed0541f857882f647bfc97e03d83371b8f4698a6 /arch/powerpc/boot/dts/lite5200.dts
parent4f917ba3d5ee9c98d60fa357e799942df8412de3 (diff)
parent4bdf0bb7d64cf672199519b3d808e2a82f5b59e9 (diff)
Merge commit 'gcl/merge' into merge
Diffstat (limited to 'arch/powerpc/boot/dts/lite5200.dts')
-rw-r--r--arch/powerpc/boot/dts/lite5200.dts2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index de30b3f9eb26..82ff2b13bc37 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -247,7 +247,6 @@
247 compatible = "fsl,mpc5200-i2c","fsl-i2c"; 247 compatible = "fsl,mpc5200-i2c","fsl-i2c";
248 reg = <0x3d00 0x40>; 248 reg = <0x3d00 0x40>;
249 interrupts = <2 15 0>; 249 interrupts = <2 15 0>;
250 fsl5200-clocking;
251 }; 250 };
252 251
253 i2c@3d40 { 252 i2c@3d40 {
@@ -256,7 +255,6 @@
256 compatible = "fsl,mpc5200-i2c","fsl-i2c"; 255 compatible = "fsl,mpc5200-i2c","fsl-i2c";
257 reg = <0x3d40 0x40>; 256 reg = <0x3d40 0x40>;
258 interrupts = <2 16 0>; 257 interrupts = <2 16 0>;
259 fsl5200-clocking;
260 }; 258 };
261 sram@8000 { 259 sram@8000 {
262 compatible = "fsl,mpc5200-sram"; 260 compatible = "fsl,mpc5200-sram";