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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6sx-udoo-neo.dtsi
diff --git
a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
index dcfc9759143375decd12bea87ad5e7547837f3bd..53b3eac94f0de605606260e111c7980887349d3c 100644
(file)
--- a/
arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
+++ b/
arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
@@
-135,7
+135,7
@@
clock-frequency = <100000>;
status = "okay";
- pmic: pmic@
0
8 {
+ pmic: pmic@8 {
compatible = "fsl,pfuze3000";
reg = <0x08>;