From: Matrix Screen Controller maintainers
Subject: [PATCH] wifi: uwe5622: make the vendor include path O= safe

The vendor Makefile resolves its source directory by changing into a path
relative to the output tree. That fails for the isolated O= build used by
the candidate kernel and drops the directory containing wcn_bus.h. Use
Kbuild's absolute srctree instead. This does not change driver behaviour.

---
 drivers/net/wireless/rtl8189es/Makefile          | 6 +++---
 drivers/net/wireless/rtl8189es/hal/phydm/phydm.mk | 2 +-
 drivers/net/wireless/uwe5622/Makefile            | 2 +-
 drivers/net/wireless/uwe5622/unisocwcn/Makefile | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/uwe5622/Makefile b/drivers/net/wireless/uwe5622/Makefile
--- a/drivers/net/wireless/uwe5622/Makefile
+++ b/drivers/net/wireless/uwe5622/Makefile
@@ -5 +5 @@
-UNISOCWCN_DIR := $(shell cd $(src)/unisocwcn/ && /bin/pwd)
+UNISOCWCN_DIR := $(srctree)/drivers/net/wireless/uwe5622/unisocwcn

diff --git a/drivers/net/wireless/uwe5622/unisocwcn/Makefile b/drivers/net/wireless/uwe5622/unisocwcn/Makefile
--- a/drivers/net/wireless/uwe5622/unisocwcn/Makefile
+++ b/drivers/net/wireless/uwe5622/unisocwcn/Makefile
@@ -132,3 +132,3 @@
-ccflags-y += -I$(src)/include/
-ccflags-y += -I$(src)/platform/
-ccflags-y += -I$(src)/platform/rf/
+ccflags-y += -I$(srctree)/drivers/net/wireless/uwe5622/unisocwcn/include/
+ccflags-y += -I$(srctree)/drivers/net/wireless/uwe5622/unisocwcn/platform/
+ccflags-y += -I$(srctree)/drivers/net/wireless/uwe5622/unisocwcn/platform/rf/

diff --git a/drivers/net/wireless/rtl8189es/Makefile b/drivers/net/wireless/rtl8189es/Makefile
--- a/drivers/net/wireless/rtl8189es/Makefile
+++ b/drivers/net/wireless/rtl8189es/Makefile
@@ -22 +22 @@
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/wireless/rtl8189es/include
@@ -252 +252 @@
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/wireless/rtl8189es/platform
@@ -255 +255 @@
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/wireless/rtl8189es/hal/btc

diff --git a/drivers/net/wireless/rtl8189es/hal/phydm/phydm.mk b/drivers/net/wireless/rtl8189es/hal/phydm/phydm.mk
--- a/drivers/net/wireless/rtl8189es/hal/phydm/phydm.mk
+++ b/drivers/net/wireless/rtl8189es/hal/phydm/phydm.mk
@@ -1 +1 @@
-EXTRA_CFLAGS += -I$(src)/hal/phydm
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/wireless/rtl8189es/hal/phydm
-- 
2.39.2