summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCNSS_WLAN Service <cnssbldsw@qualcomm.com>2017-09-21 14:43:58 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-09-21 14:43:58 -0700
commit5fb0a8694c47cd79b152ac20cd89bfdbb048b03f (patch)
treeafe61627d6d7c82d1f1a658b42ef34e06156bff5
parentc2eb76530dbf3483b53a2217b92b9aca52312d13 (diff)
parentd80eb1189357c03b92c530050444faab2249c0c5 (diff)
Merge "qcacmn: Prepend kernel includes with "kernel/"" into wlan-cmn.driver.lnx.1.0
-rw-r--r--hif/src/hif_napi.c2
-rw-r--r--qdf/linux/src/i_qdf_trace.h4
-rw-r--r--qdf/linux/src/i_qdf_types.h2
-rw-r--r--qdf/linux/src/qdf_threads.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c
index 333ba5e489ef..bbc12271c030 100644
--- a/hif/src/hif_napi.c
+++ b/hif/src/hif_napi.c
@@ -31,7 +31,7 @@
* HIF NAPI interface implementation
*/
-#include <string.h> /* memset */
+#include <linux/string.h> /* memset */
/* Linux headers */
#include <linux/cpumask.h>
diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h
index dfb4cd165d88..787f560682d9 100644
--- a/qdf/linux/src/i_qdf_trace.h
+++ b/qdf/linux/src/i_qdf_trace.h
@@ -36,8 +36,8 @@
#define __I_QDF_TRACE_H
/* older kernels have a bug in kallsyms, so ensure module.h is included */
-#include <module.h>
-#include <kallsyms.h>
+#include <linux/module.h>
+#include <linux/kallsyms.h>
#if !defined(__printf)
#define __printf(a, b)
diff --git a/qdf/linux/src/i_qdf_types.h b/qdf/linux/src/i_qdf_types.h
index c1abcced66c0..f13046c44390 100644
--- a/qdf/linux/src/i_qdf_types.h
+++ b/qdf/linux/src/i_qdf_types.h
@@ -67,7 +67,7 @@
#include <linux/wireless.h>
#include <linux/if.h>
#ifdef IPA_OFFLOAD
-#include <ipa.h>
+#include <linux/ipa.h>
#endif
#else
diff --git a/qdf/linux/src/qdf_threads.c b/qdf/linux/src/qdf_threads.c
index 928517572190..ff212b010bd8 100644
--- a/qdf/linux/src/qdf_threads.c
+++ b/qdf/linux/src/qdf_threads.c
@@ -44,7 +44,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/export.h>
-#include <stacktrace.h>
+#include <linux/stacktrace.h>
/* Function declarations and documenation */