diff options
| author | Yogish Kulkarni <yogishk@nvidia.com> | 2012-03-30 00:48:36 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-04-03 10:38:34 -0700 |
| commit | 2955ad9c5e74ec451406f7779194db7ac0409dde (patch) | |
| tree | a7f6b33a96d54727353ebb0c36debf28e915c3e7 /drivers/video/tegra/nvmap | |
| parent | 5d9ce579a137f8ed510866a8e7efb3dca9b7dbc2 (diff) | |
tegra: video: nvmap: Make nvmap_ioctl.h userspace compatible
nvmap_ioctl.h intended to be included by both kernel and
userspace code.
Change-Id: I8cccef5e3bc02f3271f471155b2e36126c68017a
Signed-off-by: Yogish Kulkarni <yogishk@nvidia.com>
Reviewed-on: http://git-master/r/93329
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/nvmap')
| -rw-r--r-- | drivers/video/tegra/nvmap/nvmap_ioctl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_ioctl.h b/drivers/video/tegra/nvmap/nvmap_ioctl.h index c802cd4dd7ae..54627683ccdb 100644 --- a/drivers/video/tegra/nvmap/nvmap_ioctl.h +++ b/drivers/video/tegra/nvmap/nvmap_ioctl.h @@ -24,9 +24,11 @@ #define __VIDEO_TEGRA_NVMAP_IOCTL_H #include <linux/ioctl.h> -#include <linux/file.h> +#ifdef __KERNEL__ +#include <linux/file.h> #include <mach/nvmap.h> +#endif enum { NVMAP_HANDLE_PARAM_SIZE = 1, @@ -136,6 +138,7 @@ struct nvmap_cache_op { #define NVMAP_IOC_MAXNR (_IOC_NR(NVMAP_IOC_GET_ID)) +#ifdef __KERNEL__ int nvmap_ioctl_pinop(struct file *filp, bool is_pin, void __user *arg); int nvmap_ioctl_get_param(struct file *filp, void __user* arg); @@ -153,6 +156,7 @@ int nvmap_map_into_caller_ptr(struct file *filp, void __user *arg); int nvmap_ioctl_cache_maint(struct file *filp, void __user *arg); int nvmap_ioctl_rw_handle(struct file *filp, int is_read, void __user* arg); +#endif |