diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-11-27 11:28:23 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2017-11-27 11:28:23 -0800 |
| commit | babd8a3e31fbb0abb4c37ee3548974732080b996 (patch) | |
| tree | 60b114054b57d057f1e3d3a6defb8c85e0c1a1bf /arch/arm/boot | |
| parent | 5f1aa51c7a1eef1c5a60b8334e32c89904964245 (diff) | |
| parent | 014d6da6cb2525d7f48fb08c705cb130cc7b5f4a (diff) | |
| download | linux-babd8a3e31fbb0abb4c37ee3548974732080b996.tar.gz linux-babd8a3e31fbb0abb4c37ee3548974732080b996.tar.bz2 linux-babd8a3e31fbb0abb4c37ee3548974732080b996.zip | |
Merge tag 'bcm2835-dt-next-fixes-2017-11-15' into devicetree/fixes
This pull request brings in a fix for a warning that started occuring
when dtc from -next got merged.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 013431e3d7c3..dcde93c85c2d 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -639,5 +639,6 @@ usbphy: phy { compatible = "usb-nop-xceiv"; + #phy-cells = <0>; }; }; |