diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
| commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
| tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/powerpc/boot/dts/sbc8560.dts | |
| parent | 7da18afa423f167e7ef3c9728e584d8bf05bd55a (diff) | |
| parent | 83e686ea0291ee93b87dcdc00b96443b80de56c9 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/powerpc/boot/dts/sbc8560.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/sbc8560.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/sbc8560.dts b/arch/powerpc/boot/dts/sbc8560.dts index 239d57a55cf4..9e13ed8a1193 100644 --- a/arch/powerpc/boot/dts/sbc8560.dts +++ b/arch/powerpc/boot/dts/sbc8560.dts | |||
| @@ -303,7 +303,6 @@ | |||
| 303 | global-utilities@e0000 { | 303 | global-utilities@e0000 { |
| 304 | compatible = "fsl,mpc8560-guts"; | 304 | compatible = "fsl,mpc8560-guts"; |
| 305 | reg = <0xe0000 0x1000>; | 305 | reg = <0xe0000 0x1000>; |
| 306 | fsl,has-rstcr; | ||
| 307 | }; | 306 | }; |
| 308 | }; | 307 | }; |
| 309 | 308 | ||