diff --git a/[refs] b/[refs] index 81ab2329b4ee..1e3f44665e50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 806e23e95f94a27ee445022d724060b9b45cb64a +refs/heads/master: a16fa71d6b2f96cb483b82ffac07459ae0939c1d diff --git a/trunk/drivers/media/video/s5p-g2d/g2d-hw.c b/trunk/drivers/media/video/s5p-g2d/g2d-hw.c index e5249f38ff71..39937cf03c88 100644 --- a/trunk/drivers/media/video/s5p-g2d/g2d-hw.c +++ b/trunk/drivers/media/video/s5p-g2d/g2d-hw.c @@ -27,7 +27,6 @@ void g2d_reset(struct g2d_dev *d) void g2d_set_src_size(struct g2d_dev *d, struct g2d_frame *f) { u32 n; - u32 stride; w(f->stride & 0xFFFF, SRC_STRIDE_REG); @@ -52,7 +51,6 @@ void g2d_set_src_addr(struct g2d_dev *d, dma_addr_t a) void g2d_set_dst_size(struct g2d_dev *d, struct g2d_frame *f) { u32 n; - u32 stride; w(f->stride & 0xFFFF, DST_STRIDE_REG);