5 files changed, 4 insertions, 10 deletions
diff --git a/drivers/usb/typec/tcpm/google/Kbuild b/drivers/usb/typec/tcpm/google/Kbuild
index ba672e143..4f6aaf208 100644
--- a/drivers/usb/typec/tcpm/google/Kbuild
+++ b/drivers/usb/typec/tcpm/google/Kbuild
@@ -10,5 +10,3 @@ obj-$(CONFIG_TYPEC_MAX77759)            += max77759_contaminant.o
 obj-$(CONFIG_POGO_TRANSPORT)		+= pogo_transport.o
 obj-$(CONFIG_TYPEC_COOLING_DEV)         += usbc_cooling_dev.o
 
-# This gives the drivers access to the tcpci.h header
-ccflags-y := -I$(srctree)/drivers/usb/typec
diff --git a/drivers/usb/typec/tcpm/google/bc_max77759.c b/drivers/usb/typec/tcpm/google/bc_max77759.c
index de046ad35..4906b238a 100644
--- a/drivers/usb/typec/tcpm/google/bc_max77759.c
+++ b/drivers/usb/typec/tcpm/google/bc_max77759.c
@@ -10,14 +10,13 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/power_supply.h>
+#include <linux/usb/tcpci.h>
 #include <linux/usb/tcpm.h>
 #include <linux/usb/typec.h>
 #include <misc/logbuffer.h>
 
 #include "bc_max77759.h"
 #include "max77759_helper.h"
-/* This header comes from the GKI kernel tree */
-#include <tcpm/tcpci.h>
 #include "tcpci_max77759.h"
 
 struct bc12_status {
diff --git a/drivers/usb/typec/tcpm/google/max77759_contaminant.c b/drivers/usb/typec/tcpm/google/max77759_contaminant.c
index 08c505eda..2c7a6ca88 100644
--- a/drivers/usb/typec/tcpm/google/max77759_contaminant.c
+++ b/drivers/usb/typec/tcpm/google/max77759_contaminant.c
@@ -8,13 +8,12 @@
 #include <linux/device.h>
 #include <linux/irqreturn.h>
 #include <linux/module.h>
+#include <linux/usb/tcpci.h>
 #include <linux/usb/tcpm.h>
 #include <linux/usb/typec.h>
 #include <misc/logbuffer.h>
 
 #include "max77759_helper.h"
-/* This header comes from the GKI kernel tree */
-#include <tcpm/tcpci.h>
 #include "tcpci_max77759.h"
 #include "tcpci_max77759_vendor_reg.h"
 
diff --git a/drivers/usb/typec/tcpm/google/tcpci_fusb307.c b/drivers/usb/typec/tcpm/google/tcpci_fusb307.c
index 878970ef3..47f7b4381 100644
--- a/drivers/usb/typec/tcpm/google/tcpci_fusb307.c
+++ b/drivers/usb/typec/tcpm/google/tcpci_fusb307.c
@@ -18,14 +18,13 @@
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/usb/role.h>
+#include <linux/usb/tcpci.h>
 #include <linux/usb/tcpm.h>
 #include <linux/usb/typec_mux.h>
 #include <misc/gvotable.h>
 #include <misc/logbuffer.h>
 
 #include "tcpci_otg_helper.h"
-/* This header comes from the GKI kernel tree */
-#include <tcpm/tcpci.h>
 #include "usb_icl_voter.h"
 #include "usb_psy.h"
 
diff --git a/drivers/usb/typec/tcpm/google/tcpci_max77759.c b/drivers/usb/typec/tcpm/google/tcpci_max77759.c
index 230202546..bd6b99cef 100644
--- a/drivers/usb/typec/tcpm/google/tcpci_max77759.c
+++ b/drivers/usb/typec/tcpm/google/tcpci_max77759.c
@@ -20,6 +20,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/spinlock.h>
 #include <linux/usb/pd.h>
+#include <linux/usb/tcpci.h>
 #include <linux/usb/tcpm.h>
 #include <linux/usb/typec.h>
 #include <misc/logbuffer.h>
@@ -28,8 +29,6 @@
 #include "bc_max77759.h"
 #include <linux/usb/max77759_export.h>
 #include "max77759_helper.h"
-/* This header comes from the GKI kernel tree */
-#include <tcpm/tcpci.h>
 #include "tcpci_max77759.h"
 #include "tcpci_max77759_vendor_reg.h"
 #include "usb_icl_voter.h"