projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux.git]
/
arch
/
arm
/
boot
/
dts
/
at91-cosino_mega2560.dts
diff --git
a/arch/arm/boot/dts/at91-cosino_mega2560.dts
b/arch/arm/boot/dts/at91-cosino_mega2560.dts
index f9415dd11f1759f892d47a54debab2630c192214..a542d5837a17be14c1f82547c59529d4a59f5ce7 100644
(file)
--- a/
arch/arm/boot/dts/at91-cosino_mega2560.dts
+++ b/
arch/arm/boot/dts/at91-cosino_mega2560.dts
@@
-27,7
+27,6
@@
};
adc0: adc@f804c000 {
- atmel,adc-clock-rate = <1000000>;
atmel,adc-ts-wires = <4>;
atmel,adc-ts-pressure-threshold = <10000>;
status = "okay";