diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-28 17:14:54 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-28 17:14:54 +1100 |
| 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 d4df8b6857a..909a89cab9a 100644 --- a/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts @@ -185,7 +185,7 @@ cell-index = <0>; device_type = "network"; model = "eTSEC"; - compatible = "gianfar", "simple-bus"; + compatible = "gianfar"; reg = <0x24000 0x1000>; local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <37 0x8 36 0x8 35 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts index 3dcc001b8ed..359c3b72742 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dts +++ b/arch/powerpc/boot/dts/mpc8572ds.dts @@ -89,7 +89,7 @@ ramdisk@0 { reg = <0x0 0x03000000>; - readl-only; + read-only; }; diagnostic@3000000 { |