summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/android/uapi/Kbuild2
-rw-r--r--include/uapi/linux/Kbuild2
-rw-r--r--[l---------]include/uapi/linux/ion.h7
-rw-r--r--include/uapi/linux/msm_ion.h6
4 files changed, 16 insertions, 1 deletions
diff --git a/drivers/staging/android/uapi/Kbuild b/drivers/staging/android/uapi/Kbuild
new file mode 100644
index 000000000000..67358c786f4f
--- /dev/null
+++ b/drivers/staging/android/uapi/Kbuild
@@ -0,0 +1,2 @@
+header-y += ion.h
+header-y += msm_ion.h
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 6cc413f4a5e5..becc069c5c42 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -22,6 +22,7 @@ header-y += netfilter_ipv4/
header-y += netfilter_ipv6/
header-y += usb/
header-y += wimax/
+header-y += ../../../drivers/staging/android/uapi/
genhdr-y += version.h
@@ -274,6 +275,7 @@ header-y += mroute6.h
header-y += mroute.h
header-y += msdos_fs.h
header-y += msg.h
+header-y += msm_ion.h
header-y += mtio.h
header-y += nbd.h
header-y += ncp_fs.h
diff --git a/include/uapi/linux/ion.h b/include/uapi/linux/ion.h
index 17e8dbb24265..fd011a90ffed 120000..100644
--- a/include/uapi/linux/ion.h
+++ b/include/uapi/linux/ion.h
@@ -1 +1,6 @@
-../../../drivers/staging/android/uapi/ion.h \ No newline at end of file
+#ifndef __UAPI_LINUX_ION_H__
+#define __UAPI_LINUX_ION_H__
+
+#include <linux/staging/android/uapi/ion.h>
+
+#endif /* __UAPI_LINUX_ION_H__ */
diff --git a/include/uapi/linux/msm_ion.h b/include/uapi/linux/msm_ion.h
new file mode 100644
index 000000000000..05900fefd792
--- /dev/null
+++ b/include/uapi/linux/msm_ion.h
@@ -0,0 +1,6 @@
+#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__ */