Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / arm / boot / dts / at91-ariag25.dts

diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
index cce45f5177f9f0aef6b40e0e775617f47398c48e..55ab6180e350d10e9c4f816095eba4910a37cbce 100644 (file)
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/arch/arm/boot/dts/at91-ariag25.dts
@@ -129,7 +129,6 @@
                        adc0: adc@f804c000 {
                                status = "okay";
                                atmel,adc-channels-used = <0xf>;
-                               atmel,adc-num-channels = <4>;
                        };
 
                        dbgu: serial@fffff200 {