summaryrefslogtreecommitdiff
path: root/uapi/linux
diff options
context:
space:
mode:
authorDustin Brown <dustinb@codeaurora.org>2017-08-17 15:44:34 -0700
committersnandini <snandini@codeaurora.org>2017-09-22 14:32:12 -0700
commitce96aa77b5c0ae10133e4296f8645c97a5369991 (patch)
treee28be38db37d9373f9c310c53842f30fe1f8b1b4 /uapi/linux
parent70d2f156d81fca4f12706030fc6c287f685126f7 (diff)
qcacld-3.0: Prepend kernel includes with "kernel/"
To avoid include conflicts, prepend all kernel includes with "kernel/" Change-Id: I8a3f037c4abf07b129875b919225825701dc1046 CRs-Fixed: 2094774
Diffstat (limited to 'uapi/linux')
-rw-r--r--uapi/linux/osapi_linux.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h
index 4e61a5e21f9e..b74b6a589d66 100644
--- a/uapi/linux/osapi_linux.h
+++ b/uapi/linux/osapi_linux.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -271,14 +271,14 @@ void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q);
#ifdef ANDROID
#ifndef err
-#include <errno.h>
+#include <linux/errno.h>
#define err(_s, args ...) do { \
fprintf(stderr, "%s: line %d ", __FILE__, __LINE__); \
fprintf(stderr, args); fprintf(stderr, ": %d\n", errno); \
exit(_s); } while (0)
#endif
#else
-#include <err.h>
+#include <linux/err.h>
#endif
#endif /* __KERNEL__ */