diff options
| author | Rakesh Sharma <rasharma@nvidia.com> | 2013-12-16 19:48:30 +0530 |
|---|---|---|
| committer | Mitch Luban <mluban@nvidia.com> | 2014-01-23 17:27:44 -0800 |
| commit | 22548942980cd0d5302efd8aee06d9eb2d2f5e9e (patch) | |
| tree | a4320827d3271639bd716a0cd214d2630e5304ac /include/media | |
| parent | d91bb55dd9a3666a6f9382b35c1b0b4758c0d309 (diff) | |
media: platform: tegra: fix compilation errors
Fix compilation errors for 64-bit kernel
Bug 1423785
Signed-off-by: Rakesh Sharma <rasharma@nvidia.com>
Change-Id: If9591732327775b310ef4bed333859bda9f9b140
Reviewed-on: http://git-master/r/345863
(cherry picked from commit 50103d95ad194f619b4b7dd3b4838e4b0e30e412)
Signed-off-by: Rakesh Sharma <rasharma@nvidia.com>
Reviewed-on: http://git-master/r/358013
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Tested-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/camera.h | 4 | ||||
| -rw-r--r-- | include/media/ov5640.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/media/camera.h b/include/media/camera.h index 9f17b7fa2673..a5258c7c2090 100644 --- a/include/media/camera.h +++ b/include/media/camera.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -154,8 +154,8 @@ enum { struct cam_update { u32 type; u32 index; - u32 arg; u32 size; + unsigned long arg; }; enum { diff --git a/include/media/ov5640.h b/include/media/ov5640.h index 4702d64d5b63..3e9ebde7caa8 100644 --- a/include/media/ov5640.h +++ b/include/media/ov5640.h @@ -1,7 +1,7 @@ /* * ov5640.h - header for YUV camera sensor OV5640 driver. * - * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2012-2014, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -37,16 +37,16 @@ #define OV5640_POWER_LEVEL_SUS 2 struct ov5640_mode { - int xres; - int yres; + __u32 xres; + __u32 yres; }; struct ov5640_config { __u32 settle_time; __u32 pos_low; __u32 pos_high; - float focal_length; - float fnumber; + __u32 focal_length; + __u32 fnumber; }; enum { |