From 43775c97dd47abf1761fd84d4632d08b96c209b1 Mon Sep 17 00:00:00 2001
From: Maximilian Weigand <mweigand@mweigand.net>
Date: Wed, 9 Oct 2024 22:59:08 +0800
Subject: [PATCH] dts: pinenote: remove rk_rga node

---
 arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
index 8858b5a5ae40..93f2998b8610 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
@@ -322,7 +322,6 @@
 	cpu-supply = <&vdd_cpu>;
 };
 
-<<<<<<< HEAD
 &ebc {
 	io-channels = <&ebc_pmic 0>;
 	panel-supply = <&v3p3>;