diff options
| author | Victor Hsu <hsuvictor@google.com> | 2021-11-10 20:57:10 +0800 |
|---|---|---|
| committer | Victor Hsu <hsuvictor@google.com> | 2021-12-13 13:37:29 +0800 |
| commit | 5cfb486d3f2b5f46683495ae82c1060da8118be4 (patch) | |
| tree | 171b6f08e1a88ab4d60fae4b03f9c1e9128fae10 /qrtr | |
| parent | c972edc5cac0526943caaa390ddd0faf2ecb18db (diff) | |
| download | cnss2-5cfb486d3f2b5f46683495ae82c1060da8118be4.tar.gz | |
wcn6740: Change the include path to out-of-kernel tree
Change the include path to make sure to include
the correct header files in out-of-kernel tree.
Bug: 203725513
Signed-off-by: Victor Hsu <hsuvictor@google.com>
Change-Id: Iaff00aca3b1e3faa77ffb54bf7eb59b6ca296c58
Diffstat (limited to 'qrtr')
| -rw-r--r-- | qrtr/Makefile | 11 | ||||
| -rw-r--r-- | qrtr/mhi.c | 4 | ||||
| -rw-r--r-- | qrtr/ns.c | 7 | ||||
| -rw-r--r-- | qrtr/qrtr.c | 8 |
4 files changed, 20 insertions, 10 deletions
diff --git a/qrtr/Makefile b/qrtr/Makefile index 9aae41b..d7d2d4b 100644 --- a/qrtr/Makefile +++ b/qrtr/Makefile @@ -1,12 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +#ccflags-y += -I$(WLAN_PLATFORM_ROOT)/inc obj-$(CONFIG_QRTR) := qrtr.o ns.o - -obj-$(CONFIG_QRTR_SMD) += qrtr-smd.o -qrtr-smd-y := smd.o -obj-$(CONFIG_QRTR_TUN) += qrtr-tun.o -qrtr-tun-y := tun.o obj-$(CONFIG_QRTR_MHI) += qrtr-mhi.o -qrtr-mhi-y := mhi.o -obj-$(CONFIG_QRTR_GUNYAH) += qrtr-gunyah.o -qrtr-gunyah-y := gunyah.o -ccflags-y += -DDEBUG +qrtr-mhi-y := mhi.o
\ No newline at end of file @@ -3,7 +3,11 @@ * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */ +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "mhi.h" +#else #include <linux/mhi.h> +#endif #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/pci.h> @@ -7,9 +7,14 @@ #define pr_fmt(fmt) "qrtr: %s(): " fmt, __func__ +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "ipc_logging.h" +#include "uapi/qrtr.h" +#else #include <linux/ipc_logging.h> -#include <linux/module.h> #include <linux/qrtr.h> +#endif +#include <linux/module.h> #include <linux/workqueue.h> #include <linux/xarray.h> #include <net/sock.h> diff --git a/qrtr/qrtr.c b/qrtr/qrtr.c index 3f21c45..96a1b6d 100644 --- a/qrtr/qrtr.c +++ b/qrtr/qrtr.c @@ -6,7 +6,11 @@ #include <linux/kthread.h> #include <linux/module.h> #include <linux/netlink.h> +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "uapi/qrtr.h" +#else #include <linux/qrtr.h> +#endif #include <linux/termios.h> /* For TIOCINQ/OUTQ */ #include <linux/numa.h> #include <linux/spinlock.h> @@ -14,7 +18,11 @@ #include <linux/rwsem.h> #include <linux/uidgid.h> #include <linux/pm_wakeup.h> +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "ipc_logging.h" +#else #include <linux/ipc_logging.h> +#endif #include <net/sock.h> #include <uapi/linux/sched/types.h> |