diff options
author | Russell King | 2009-12-04 15:59:47 +0100 |
---|---|---|
committer | Russell King | 2009-12-04 15:59:47 +0100 |
commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
tree | 7b72b66081d042a41dc822575503133364857ce2 /arch/powerpc/boot/dts/tqm5200.dts | |
parent | ARM: 5846/1: MAINTAINERS: Add arm Nomadik support (diff) | |
parent | ARM: I-cache: flush executable mappings in flush_cache_range() (diff) | |
download | kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.gz kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.xz kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.zip |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'arch/powerpc/boot/dts/tqm5200.dts')
-rw-r--r-- | arch/powerpc/boot/dts/tqm5200.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/tqm5200.dts b/arch/powerpc/boot/dts/tqm5200.dts index c9590b58b7b0..1db07f6cf133 100644 --- a/arch/powerpc/boot/dts/tqm5200.dts +++ b/arch/powerpc/boot/dts/tqm5200.dts @@ -160,7 +160,6 @@ compatible = "fsl,mpc5200-i2c","fsl-i2c"; reg = <0x3d40 0x40>; interrupts = <2 16 0>; - fsl5200-clocking; rtc@68 { compatible = "dallas,ds1307"; |