diff options
| author | Laura Abbott <lauraa@codeaurora.org> | 2014-08-04 14:20:26 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:04:52 -0700 |
| commit | c75946685baebd0b9c6b2e546e143c16589effd3 (patch) | |
| tree | 424b0ad16cada32f9626b988f9ce025e6b9fdc8d /include/uapi/linux | |
| parent | 93bfd6dbacf04c8b31a0f947eac9bd4c4548aaed (diff) | |
ion: Export ion headers to userspace
Ion headers need to go to userspace. Export them via the staging tree
Change-Id: I9b622efaae3d0ed764ce064da228112c363c066d
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/Kbuild | 2 | ||||
| -rw-r--r--[l---------] | include/uapi/linux/ion.h | 7 | ||||
| -rw-r--r-- | include/uapi/linux/msm_ion.h | 6 |
3 files changed, 14 insertions, 1 deletions
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__ */ |