Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 331240
b: refs/heads/master
c: d2331c9
h: refs/heads/master
v: v3
  • Loading branch information
Sachin Kamat authored and Mauro Carvalho Chehab committed Oct 2, 2012
1 parent bd0170b commit 806ea73
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b2e0e70ac256593d9eefc070f9b3f47fbb9f3e2
refs/heads/master: d2331c991354a50bf65d114b2e88d77980223035
4 changes: 2 additions & 2 deletions trunk/drivers/media/platform/exynos-gsc/gsc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ int gsc_enum_fmt_mplane(struct v4l2_fmtdesc *f)
return 0;
}

u32 get_plane_info(struct gsc_frame *frm, u32 addr, u32 *index)
static u32 get_plane_info(struct gsc_frame *frm, u32 addr, u32 *index)
{
if (frm->addr.y == addr) {
*index = 0;
Expand Down Expand Up @@ -743,7 +743,7 @@ static int gsc_s_ctrl(struct v4l2_ctrl *ctrl)
return ret;
}

const struct v4l2_ctrl_ops gsc_ctrl_ops = {
static const struct v4l2_ctrl_ops gsc_ctrl_ops = {
.s_ctrl = gsc_s_ctrl,
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ static void gsc_m2m_job_abort(void *priv)
gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
}

int gsc_fill_addr(struct gsc_ctx *ctx)
static int gsc_fill_addr(struct gsc_ctx *ctx)
{
struct gsc_frame *s_frame, *d_frame;
struct vb2_buffer *vb = NULL;
Expand Down Expand Up @@ -249,7 +249,7 @@ static void gsc_m2m_buf_queue(struct vb2_buffer *vb)
v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);
}

struct vb2_ops gsc_m2m_qops = {
static struct vb2_ops gsc_m2m_qops = {
.queue_setup = gsc_m2m_queue_setup,
.buf_prepare = gsc_m2m_buf_prepare,
.buf_queue = gsc_m2m_buf_queue,
Expand Down

0 comments on commit 806ea73

Please sign in to comment.