diff --git a/[refs] b/[refs] index 3842874e19c1..8822e901c5b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: beb9e780a45a2e21f3d62bd4c71d695aa195fe69 +refs/heads/master: fe2b8f50a336bcd51e3d209c5838c573b4b540b3 diff --git a/trunk/drivers/media/video/stk-sensor.c b/trunk/drivers/media/video/stk-sensor.c index 1a8692d9ee5a..e546b014d7ad 100644 --- a/trunk/drivers/media/video/stk-sensor.c +++ b/trunk/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; diff --git a/trunk/drivers/media/video/stk-webcam.h b/trunk/drivers/media/video/stk-webcam.h index a2164cb1ad26..df4dfefc5327 100644 --- a/trunk/drivers/media/video/stk-webcam.h +++ b/trunk/drivers/media/video/stk-webcam.h @@ -128,8 +128,6 @@ void stk_camera_delete(struct kref *); int stk_camera_write_reg(struct stk_camera *, u16, u8); int stk_camera_read_reg(struct stk_camera *, u16, int *); -int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val); -int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val); int stk_sensor_init(struct stk_camera *); int stk_sensor_configure(struct stk_camera *); int stk_sensor_sleep(struct stk_camera *dev);