From 4d667a6aff6ce8089973b73a5e6645e750045356 Mon Sep 17 00:00:00 2001 From: Bryan Wu Date: Thu, 29 Nov 2012 16:01:28 -0800 Subject: 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 Reviewed-on: http://git-master/r/167510 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Winnie Hsu --- include/media/tegra_camera.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3