diff --git a/[refs] b/[refs] index abf3570ea7b7..aa522d082729 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1259762facdcf31ea362997d9682ccc3d93d7346 +refs/heads/master: a13bba4f35eee67552b0fcfb0790d9a0f5f5fd07 diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c index 9b7fe3375877..6fc22256847b 100644 --- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c +++ b/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c @@ -70,7 +70,7 @@ static void wake_up_dev(struct s5p_mfc_dev *dev, unsigned int reason, wake_up(&dev->queue); } -void s5p_mfc_watchdog(unsigned long arg) +static void s5p_mfc_watchdog(unsigned long arg) { struct s5p_mfc_dev *dev = (struct s5p_mfc_dev *)arg; diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_opr.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_opr.c index a8028297fc70..e6217cbfa4a3 100644 --- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_opr.c +++ b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_opr.c @@ -296,7 +296,7 @@ void s5p_mfc_set_dec_desc_buffer(struct s5p_mfc_ctx *ctx) } /* Set registers for shared buffer */ -void s5p_mfc_set_shared_buffer(struct s5p_mfc_ctx *ctx) +static void s5p_mfc_set_shared_buffer(struct s5p_mfc_ctx *ctx) { struct s5p_mfc_dev *dev = ctx->dev; mfc_write(dev, ctx->shm_ofs, S5P_FIMV_SI_CH0_HOST_WR_ADR);