diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-16 02:08:24 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-19 11:47:13 -0400 |
| commit | a3e008d1b5e39abe81e233bde623604841ff9a73 (patch) | |
| tree | 9b7e0cb2002fc6b6c7dfc5afdc81cb056e44ecaa | |
| parent | 4319f78f422eb391bd7d63ccedbb8a2b1ab059df (diff) | |
| parent | 35faad2a1563b3d4dc983a82ac41033fe053870c (diff) | |
Merge tag 'fixes-non-3.12-2' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
From Jason Cooper, mvebu fixes-non-critical for v3.12 (round 2):
- fix the memory node (2 by 2) in skeleton64.dtsi
* tag 'fixes-non-3.12-2' of git://git.infradead.org/linux-mvebu:
ARM: dts: Fix memory node in skeleton64.dtsi
| -rw-r--r-- | arch/arm/boot/dts/skeleton64.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/skeleton64.dtsi b/arch/arm/boot/dts/skeleton64.dtsi index 15994158a998..b5d7f36f33de 100644 --- a/arch/arm/boot/dts/skeleton64.dtsi +++ b/arch/arm/boot/dts/skeleton64.dtsi | |||
| @@ -9,5 +9,5 @@ | |||
| 9 | #size-cells = <2>; | 9 | #size-cells = <2>; |
| 10 | chosen { }; | 10 | chosen { }; |
| 11 | aliases { }; | 11 | aliases { }; |
| 12 | memory { device_type = "memory"; reg = <0 0>; }; | 12 | memory { device_type = "memory"; reg = <0 0 0 0>; }; |
| 13 | }; | 13 | }; |