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 'topic/drm-fixes-2015-11-11' of git://anongit.freedesktop.org/drm-intel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx35.dtsi
diff --git
a/arch/arm/boot/dts/imx35.dtsi
b/arch/arm/boot/dts/imx35.dtsi
index e6540b5cfa4cac9c06d354be4fdea73c999cd85b..ed3dc3391d1c54e41803b32b059d06f82771aae9 100644
(file)
--- a/
arch/arm/boot/dts/imx35.dtsi
+++ b/
arch/arm/boot/dts/imx35.dtsi
@@
-29,7
+29,7
@@
#size-cells = <0>;
cpu {
- compatible = "arm,arm1136";
+ compatible = "arm,arm1136
jf-s
";
device_type = "cpu";
};
};