Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / stk-sensor.c

diff --git a/drivers/media/video/stk-sensor.c b/drivers/media/video/stk-sensor.c
index 1a8692d9ee5a423ede25781d65dc25c2e288973a..e546b014d7ad7f47d73ba759ca73ff60b09fd2ff 100644 (file)
--- a/drivers/media/video/stk-sensor.c
+++ b/drivers/media/video/stk-sensor.c
@@ -225,7 +225,7 @@
 
 
 /* Returns 0 if OK */
-int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)
+static int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)
 {
        int i = 0;
        int tmpval = 0;
@@ -250,7 +250,7 @@ int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)
                return 0;
 }
 
-int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val)
+static int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val)
 {
        int i = 0;
        int tmpval = 0;