summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorJeremy Gebben <jgebben@codeaurora.org>2016-02-09 13:35:27 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:07:51 -0700
commitbe3345a0327b45f9c1334fe44f830bfe3f92a761 (patch)
treef7aef48420b2120f90ea88c3fbcd147160711294 /include/uapi
parentbfa70fb909970a1d18f0eedd48520f81d49e91fc (diff)
uapi: fix export of msm_ion.h
Make this file be exported via symlink like the rest of the android staging uapi headers. Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/Kbuild1
l---------[-rw-r--r--]include/uapi/linux/ion.h7
l---------[-rw-r--r--]include/uapi/linux/msm_ion.h7
3 files changed, 2 insertions, 13 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index aa78179c0d20..a4859e2c673e 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -22,7 +22,6 @@ header-y += netfilter_ipv4/
header-y += netfilter_ipv6/
header-y += usb/
header-y += wimax/
-header-y += ../../../drivers/staging/android/uapi/
genhdr-y += version.h
diff --git a/include/uapi/linux/ion.h b/include/uapi/linux/ion.h
index fd011a90ffed..17e8dbb24265 100644..120000
--- a/include/uapi/linux/ion.h
+++ b/include/uapi/linux/ion.h
@@ -1,6 +1 @@
-#ifndef __UAPI_LINUX_ION_H__
-#define __UAPI_LINUX_ION_H__
-
-#include <linux/staging/android/uapi/ion.h>
-
-#endif /* __UAPI_LINUX_ION_H__ */
+../../../drivers/staging/android/uapi/ion.h \ No newline at end of file
diff --git a/include/uapi/linux/msm_ion.h b/include/uapi/linux/msm_ion.h
index 05900fefd792..94349d27efa6 100644..120000
--- a/include/uapi/linux/msm_ion.h
+++ b/include/uapi/linux/msm_ion.h
@@ -1,6 +1 @@
-#ifndef __UAPI_LINUX_MSM_ION_H__
-#define __UAPI_LINUX_MSM_ION_H__
-
-#include <linux/staging/android/uapi/msm_ion.h>
-
-#endif /* __UAPI_LINUX_MSM_ION_H__ */
+../../../drivers/staging/android/uapi/msm_ion.h \ No newline at end of file