diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-16 11:16:34 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-16 11:16:34 -0400 |
commit | 32dc496b47eb31f7a1d115a2708e8ef1d054e1fb (patch) | |
tree | b0ae57b9b55a0277395934ea75de00f8f54d227a /arch/powerpc/boot/dts/tqm8560.dts | |
parent | 8cd50e8e2b416c7f07b267ab3457c6c25a540ba9 (diff) | |
parent | c5ab660db9a98187667d017bb9425f0c1dc76ac1 (diff) |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
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 feff915e0492..b6c2d71defd3 100644 --- a/arch/powerpc/boot/dts/tqm8560.dts +++ b/arch/powerpc/boot/dts/tqm8560.dts | |||
@@ -85,9 +85,9 @@ | |||
85 | interrupt-parent = <&mpic>; | 85 | interrupt-parent = <&mpic>; |
86 | dfsrr; | 86 | dfsrr; |
87 | 87 | ||
88 | dtt@50 { | 88 | dtt@48 { |
89 | compatible = "national,lm75"; | 89 | compatible = "national,lm75"; |
90 | reg = <0x50>; | 90 | reg = <0x48>; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | rtc@68 { | 93 | rtc@68 { |