MLK-10115: ov5640:define function ov5640_turn_on_AE_AG() with static

ov5640 driver will failed to build with build-in:
drivers/media/platform/mxc/subdev/built-in.o: In function
`ov5640_turn_on_AE_AG':
ov5640.c:(.text+0x3890): multiple definition of `ov5640_turn_on_AE_AG'
drivers/media/platform/mxc/capture/built-in.o:v4l2-int-device.c:(.text+0x783c):
first defined here
make[3]: *** [drivers/media/platform/built-in.o] Error 1
make[2]: *** [drivers/media/platform] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2
make: *** Waiting for unfinished jobs....

It is caused by function of ov5640_turn_on_AE_AG define as global function,
change it to static function to resolv the issue.

Signed-off-by: Sandor Yu <R01008@freescale.com>

diff --git a/drivers/media/platform/mxc/capture/ov5640.c b/drivers/media/platform/mxc/capture/ov5640.c
index d781684d134006688c9af5d6aad50d542cc00532..2f7253c3c186f792ba4933cba56f7ef10f0948f1 100644 (file)
--- a/drivers/media/platform/mxc/capture/ov5640.c
+++ b/drivers/media/platform/mxc/capture/ov5640.c
@@ -991,7 +991,7 @@ static int ov5640_set_night_mode(int enable)
 
 /* enable = 0 to turn off AEC/AGC
    enable = 1 to turn on AEC/AGC */
-void ov5640_turn_on_AE_AG(int enable)
+static void ov5640_turn_on_AE_AG(int enable)
 {
        u8 ae_ag_ctrl;
 

diff --git a/drivers/media/platform/mxc/subdev/ov5640.c b/drivers/media/platform/mxc/subdev/ov5640.c
index ee3870748e246824cf64874ae5fba383eeb25336..b4247e563a90e1dba8187a2b6108f0be33190716 100644 (file)
--- a/drivers/media/platform/mxc/subdev/ov5640.c
+++ b/drivers/media/platform/mxc/subdev/ov5640.c
@@ -1076,7 +1076,7 @@ static int ov5640_set_night_mode(int enable)
 
 /* enable = 0 to turn off AEC/AGC
    enable = 1 to turn on AEC/AGC */
-void ov5640_turn_on_AE_AG(int enable)
+static void ov5640_turn_on_AE_AG(int enable)
 {
        u8 ae_ag_ctrl;