diff options
| author | Bryan Wu <pengw@nvidia.com> | 2012-11-29 16:01:28 -0800 |
|---|---|---|
| committer | Winnie Hsu <whsu@nvidia.com> | 2012-12-17 11:29:27 -0800 |
| commit | 4d667a6aff6ce8089973b73a5e6645e750045356 (patch) | |
| tree | 17ddbbc3b91d072c067f960db133628d2b0e1867 /include | |
| parent | 48105b8d2b4ae39660655fb26fc7d6459643d3d4 (diff) | |
tegra_camera: fix building error when disable CONFIG_TEGRA_CAMERA
LD vmlinux.o
drivers/built-in.o: In function `is_tegra_camera_on':
/home/roc/Work/bug_vip/source_vibrante/kernel/include/media/
tegra_camera.h:59: multiple definition of `is_tegra_camera_on'
arch/arm/mach-tegra/built-in.o:/home/roc/Work/bug_vip/source_vibrante
/kernel/include/media/tegra_camera.h:59: first defined here
make: *** [vmlinux.o] Error 1
Commit '678708d WAR: gr3d: limit 3d clock when camera is on'
introduced a function is_tegra_camera_on(), which is dummy when
CONFIG_TEGRA_CAMERA is disabled. But it will be multiple defined
when includ this header file in multiple C files.
So marking it as static will kill this error.
Change-Id: I9dbcf1231f744c23e761d70da0bfc874fb286e4a
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Reviewed-on: http://git-master/r/167510
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Winnie Hsu <whsu@nvidia.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/tegra_camera.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/tegra_camera.h b/include/media/tegra_camera.h index 3c41864cc71f..d47839282382 100644 --- a/include/media/tegra_camera.h +++ b/include/media/tegra_camera.h @@ -56,7 +56,7 @@ struct tegra_camera_platform_data { #if defined(CONFIG_TEGRA_CAMERA) int is_tegra_camera_on(void); #else -int is_tegra_camera_on(void) { return 0; } +static inline int is_tegra_camera_on(void) { return 0; } #endif #define TEGRA_CAMERA_IOCTL_ENABLE _IOWR('i', 1, uint) |