diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-28 01:14:54 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-28 01:14:54 -0500 |
commit | 0411648e445d850ded24aba98f1774c417bf5658 (patch) | |
tree | e7a79e6ea66cd38968e98b0966212d43e43a07a8 /arch/powerpc/boot | |
parent | e4a7ca29039e615ce13a61b9c6abfb2aa394e9a1 (diff) | |
parent | b57cee20a5654620337d1a5e9b5f929a4a6c302c (diff) |
Merge commit 'kumar/kumar-merge' into merge
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8313erdb.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8572ds.dts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts index d4df8b6857a4..909a89cab9ac 100644 --- a/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts | |||
@@ -185,7 +185,7 @@ | |||
185 | cell-index = <0>; | 185 | cell-index = <0>; |
186 | device_type = "network"; | 186 | device_type = "network"; |
187 | model = "eTSEC"; | 187 | model = "eTSEC"; |
188 | compatible = "gianfar", "simple-bus"; | 188 | compatible = "gianfar"; |
189 | reg = <0x24000 0x1000>; | 189 | reg = <0x24000 0x1000>; |
190 | local-mac-address = [ 00 00 00 00 00 00 ]; | 190 | local-mac-address = [ 00 00 00 00 00 00 ]; |
191 | interrupts = <37 0x8 36 0x8 35 0x8>; | 191 | interrupts = <37 0x8 36 0x8 35 0x8>; |
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts index 3dcc001b8ed3..359c3b727420 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dts +++ b/arch/powerpc/boot/dts/mpc8572ds.dts | |||
@@ -89,7 +89,7 @@ | |||
89 | 89 | ||
90 | ramdisk@0 { | 90 | ramdisk@0 { |
91 | reg = <0x0 0x03000000>; | 91 | reg = <0x0 0x03000000>; |
92 | readl-only; | 92 | read-only; |
93 | }; | 93 | }; |
94 | 94 | ||
95 | diagnostic@3000000 { | 95 | diagnostic@3000000 { |