Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2bdf7dc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Fix compilation failure of SDM855"

parents b1d9a051 d098c77a

arch/arm64/boot/dts/qcom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdm855-v2-cdp-overlay.dtbo \

		sdm855-v2-mtp-overlay.dtbo \

		sdm855-v2-rumi-overlay.dtbo \

		sdm855-v2-qrd-overlay.dtbo

		sdm855-v2-qrd-overlay.dtbo \

		sdm855-sdx50m-cdp-overlay.dtbo \

		sdm855-sdx50m-mtp-overlay.dtbo

arch/arm64/boot/dts/qcom/sdm855-sdx50m-cdp-overlay.dts

+1 −2
Original line number Diff line number Diff line
@@ -19,9 +19,8 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm855-cdp.dtsi"

#include "sdm855-audio-overlay.dtsi"



#include "external-soc.dtsi"

#include "sdx50m-external-soc.dtsi"

#include "sdm855-sdx50m.dtsi"



/ {

arch/arm64/boot/dts/qcom/sdm855-sdx50m-mtp-overlay.dts

+1 −2
Original line number Diff line number Diff line
@@ -19,9 +19,8 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm855-mtp.dtsi"

#include "sdm855-mtp-audio-overlay.dtsi"



#include "external-soc.dtsi"

#include "sdx50m-external-soc.dtsi"

#include "sdm855-sdx50m.dtsi"



/ {