git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx31.dtsi
diff --git
a/arch/arm/boot/dts/imx31.dtsi
b/arch/arm/boot/dts/imx31.dtsi
index 23b0d2cf9acdcde0180b50b0b7635a52ddd92ecc..a72031407ebdb52519229af5bac9e448dd66ce4f 100644
(file)
--- a/
arch/arm/boot/dts/imx31.dtsi
+++ b/
arch/arm/boot/dts/imx31.dtsi
@@
-30,12
+30,13
@@
};
cpus {
- #address-cells = <
0
>;
+ #address-cells = <
1
>;
#size-cells = <0>;
- cpu {
+ cpu
@0
{
compatible = "arm,arm1136jf-s";
device_type = "cpu";
+ reg = <0>;
};
};