From 8392a6169daf8fa144e367923ead49e7cdaea09a Mon Sep 17 00:00:00 2001 From: Yue Sun Date: Tue, 30 May 2023 10:48:39 +0800 Subject: [PATCH] arm/dts: Fix FirmwareDtboVerification#testVerifyOverlay Some overlays in blair-bangkk-common-overlay.dtsi depend on the definition that in the blair-pm6125-bangkk-common-overlay.dtsi hence we should move it to the front. Change-Id: I8efdc43b533cce589716f86479c356b71f42320b Signed-off-by: Yue Sun Reviewed-on: https://gerrit.mot.com/2625501 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- qcom/.blair.dtsi.swp | Bin 16384 -> 0 bytes qcom/blair-pm6125-bangkk-common-overlay.dtsi | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 qcom/.blair.dtsi.swp diff --git a/qcom/.blair.dtsi.swp b/qcom/.blair.dtsi.swp deleted file mode 100644 index d179567667d11a72d02c4215f3762b6dd9bb9012..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 diff --git a/qcom/blair-pm6125-bangkk-common-overlay.dtsi b/qcom/blair-pm6125-bangkk-common-overlay.dtsi index 0b0c3ffb3980..12716313a7c9 100644 --- a/qcom/blair-pm6125-bangkk-common-overlay.dtsi +++ b/qcom/blair-pm6125-bangkk-common-overlay.dtsi @@ -9,8 +9,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include "blair-bangkk-common-overlay.dtsi" #include "blair-pm6125-moto-common-overlay.dtsi" +#include "blair-bangkk-common-overlay.dtsi" #include "bangkk-charger.dtsi" &pm7250b_charger {