CVS commit: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Jan  3 16:29:42 UTC 2020

Modified Files:
        src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
            sun50i-h6-pine-h64.dts

Log Message:
Fix merge botch (uwb3 is no more. it is now dwc3)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
    
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.6 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.7
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.6	Fri Jan  3 15:04:33 2020
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts	Fri Jan  3 16:29:42 2020
@@ -280,10 +280,6 @@
 	status = "okay";
 };
 
-&usb3 {
-	status = "okay";
-};
-
 &usb3phy {
 	phy-supply = <&reg_usb_vbus>;
 	status = "okay";