diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2017-06-12 15:36:53 +0200 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2017-06-12 15:36:53 +0200 |
| commit | fe3c334b1bee7205282ff509810200768952f682 (patch) | |
| tree | edf385d9617a1182abb340e5318a0a61a01330f4 | |
| parent | e29d343eeb242e5ac63aac14c5ae831fd1275450 (diff) | |
fixup dt mergeintegration-linux-qcomlt-v4.12-rc1
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 8980cb8458266..1e9f4c02b5e65 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -1347,7 +1347,6 @@ }; }; }; ->>>>>>> dts:arm64: msm8996: add apr and sound card nodes }; adsp-smp2p { |