diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2022-07-02 22:03:46 -0500 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2022-07-02 22:17:36 -0500 |
| commit | 817c2f3519745749e60ea35d9be676819bb2fe6a (patch) | |
| tree | 6f9aab9df75a1d96519459ec4e4480d2dfddd6d1 /arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | |
| parent | a10b760b7402563661fa305882b181a75a1d4894 (diff) | |
| parent | 5fb779558f1c97e2bf2794cb59553e569c38e2f9 (diff) | |
Merge tag 'qcom-arm64-fixes-for-5.19' into arm64-for-5.20
This merges the 'qcom-arm64-fixes-for-5.19' tag into arm64-for-5.20 to
handle the merge conflict related to the header file changes in
sc7180-trogdor.
Diffstat (limited to 'arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 5fc687322d5d..2cf7d5212c61 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -5,7 +5,7 @@ * Copyright 2020 Google LLC. */ -#include "sc7180-trogdor.dtsi" +/* This file must be included after sc7180-trogdor.dtsi */ #include <arm/cros-ec-keyboard.dtsi> &ap_sar_sensor { |