fix unidiff warning from patches of rockchip64-6.3

This commit is contained in:
amazingfate 2023-05-05 09:44:54 +08:00 committed by Ricardo Pardini
parent 85bab47bba
commit 495d35be49
2 changed files with 5 additions and 5 deletions

View File

@ -203,9 +203,9 @@ index 82b19ebd7838..6f00b17afc15 100644
#include <linux/jiffies.h>
#include <linux/kernel.h>
@@ -476,6 +477,12 @@ struct tcpm_port {
* transitions.
*/
bool potential_contaminant;
* transitions.
*/
bool potential_contaminant;
+
+#ifdef CONFIG_EXTCON
+ struct extcon_dev *extcon;
@ -272,7 +272,7 @@ index 82b19ebd7838..6f00b17afc15 100644
@@ -1064,7 +1101,9 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
tcpm_log(port, "Failed to register partner SVID 0x%04x",
modep->altmode_desc[i].svid);
altmode = NULL;
altmode = NULL;
- }
+ } else {
+ tcpm_log(port, "Registered altmode 0x%04x", modep->altmode_desc[i].svid);

View File

@ -11,7 +11,7 @@ index 6ec65b460e2..bd7895553d7 100644
vin-supply = <&vcc5v0_sys>;
};
@@ -528,9 +530,11 @@ &pcie0 {
@@ -528,8 +530,10 @@ &pcie0 {
num-lanes = <4>;
pinctrl-0 = <&pcie_clkreqnb_cpm>;
pinctrl-names = "default";