Merge branch 'master' into fixes

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / am335x-cm-t335.dts

diff --git a/arch/arm/boot/dts/am335x-cm-t335.dts b/arch/arm/boot/dts/am335x-cm-t335.dts
index c4d3e1f1a95e73a6bc345ee4863027b2a561cb74..2c724bb60417b9b67770a6d23d4b5d8d487a2332 100644 (file)
--- a/arch/arm/boot/dts/am335x-cm-t335.dts
+++ b/arch/arm/boot/dts/am335x-cm-t335.dts
@@ -393,7 +393,7 @@ status = "okay";
 &epwmss0 {
        status = "okay";
 
-       ecap0: ecap@48300100 {
+       ecap0: ecap@100 {
                status = "okay";
                pinctrl-names = "default";
                pinctrl-0 = <&ecap0_pins>;