diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
| commit | 76523de61993d015f7895d06deacd3fd454574a1 (patch) | |
| tree | 7b2890ac9733c55ff73c72bba7b6b5c788ba925b /arch/arm/boot/dts/armada-385-linksys.dtsi | |
| parent | uprobes/x86: Emulate push insns for uprobe on x86 (diff) | |
| parent | Linux 4.15-rc3 (diff) | |
| download | linux-76523de61993d015f7895d06deacd3fd454574a1.tar.xz linux-76523de61993d015f7895d06deacd3fd454574a1.zip | |
Merge tag 'v4.15-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/armada-385-linksys.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-385-linksys.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi index e1f355ffc8f7..434dc9aaa5e4 100644 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -66,6 +66,7 @@ usb3_1_phy: usb3_1-phy { compatible = "usb-nop-xceiv"; vcc-supply = <&usb3_1_vbus>; + #phy-cells = <0>; }; usb3_1_vbus: usb3_1-vbus { |