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 branch 'next/late' with mainline
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
mt2701-evb.dts
diff --git
a/arch/arm/boot/dts/mt2701-evb.dts
b/arch/arm/boot/dts/mt2701-evb.dts
index 879f1ebfc16d6bd9fda9fd84fd5bcd502a8db11b..a4837985b7a7dc399be9ce3729aa15e4caccbc76 100644
(file)
--- a/
arch/arm/boot/dts/mt2701-evb.dts
+++ b/
arch/arm/boot/dts/mt2701-evb.dts
@@
-24,6
+24,10
@@
};
};
+&auxadc {
+ status = "okay";
+};
+
&pio {
spi_pins_a: spi0@0 {
pins_spi {