openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Olof Johansson 2013-08-15 23:08:24 -07:00 committed by Kevin Hilman
parent 4319f78f42 35faad2a15
commit a3e008d1b5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/skeleton64.dtsi
View File

@ -9,5 +9,5 @@ / {
#size-cells = <2>; #size-cells = <2>;
chosen { }; chosen { };
aliases { }; aliases { };
memory { device_type = "memory"; reg = <0 0>; }; memory { device_type = "memory"; reg = <0 0 0 0>; };
}; };