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 remote-tracking branch 'regulator/fix/core' into regulator-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx25.dtsi
diff --git
a/arch/arm/boot/dts/imx25.dtsi
b/arch/arm/boot/dts/imx25.dtsi
index dfcc8e00cf1c53a753dc753c2c5598b220b480a1..0ade3619f3c3f1332b8d89c8d06ed4a67f29025b 100644
(file)
--- a/
arch/arm/boot/dts/imx25.dtsi
+++ b/
arch/arm/boot/dts/imx25.dtsi
@@
-297,6
+297,7
@@
#address-cells = <1>;
#size-cells = <1>;
status = "disabled";
+ ranges;
adc: adc@50030800 {
compatible = "fsl,imx25-gcq";