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