diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-06-21 17:35:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-21 17:35:22 -0400 |
| commit | 3d09198243b89457649241fb63f809a96a22a8ce (patch) | |
| tree | f8f62d4a0b47ebc44682363a8d23b8963e1ca3e9 /arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | |
| parent | Merge branch 'qed-File-split-and-rename-towards-iWARP-support' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-3d09198243b89457649241fb63f809a96a22a8ce.tar.xz linux-dev-3d09198243b89457649241fb63f809a96a22a8ce.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two entries being added at the same time to the IFLA
policy table, whilst parallel bug fixes to decnet
routing dst handling overlapping with the dst gc removal
in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi index 4d314a253fd9..732e2e06f503 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi @@ -40,7 +40,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "sunxi-h3-h5.dtsi" +#include <arm/sunxi-h3-h5.dtsi> / { cpus { |