diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-10-28 09:56:18 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-10-28 09:56:18 +1100 |
| commit | 40578fca24e7f777f3da7a693b030ae28ef7e486 (patch) | |
| tree | ed0541f857882f647bfc97e03d83371b8f4698a6 /arch/powerpc/boot/dts/motionpro.dts | |
| parent | 4f917ba3d5ee9c98d60fa357e799942df8412de3 (diff) | |
| parent | 4bdf0bb7d64cf672199519b3d808e2a82f5b59e9 (diff) | |
| download | linux-40578fca24e7f777f3da7a693b030ae28ef7e486.tar.gz linux-40578fca24e7f777f3da7a693b030ae28ef7e486.tar.xz | |
Merge commit 'gcl/merge' into merge
Diffstat (limited to 'arch/powerpc/boot/dts/motionpro.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/motionpro.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/motionpro.dts b/arch/powerpc/boot/dts/motionpro.dts index 7be8ca038676..6ca4fc144a33 100644 --- a/arch/powerpc/boot/dts/motionpro.dts +++ b/arch/powerpc/boot/dts/motionpro.dts @@ -222,7 +222,6 @@ compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c"; reg = <0x3d40 0x40>; interrupts = <2 16 0>; - fsl5200-clocking; rtc@68 { compatible = "dallas,ds1339"; |