Hi Hans, Thank you for the patch. On Friday 07 March 2014 11:21:18 Hans Verkuil wrote: > From: Hans Verkuil <hans.verkuil@xxxxxxxxx> > > Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > --- > drivers/media/i2c/ad9389b.c | 2 +- > drivers/media/i2c/adv7511.c | 2 +- > drivers/media/i2c/adv7604.c | 4 ++-- > drivers/media/i2c/adv7842.c | 4 ++-- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/i2c/ad9389b.c b/drivers/media/i2c/ad9389b.c > index 83225d6..1b7ecfd 100644 > --- a/drivers/media/i2c/ad9389b.c > +++ b/drivers/media/i2c/ad9389b.c > @@ -573,7 +573,7 @@ static const struct v4l2_subdev_core_ops > ad9389b_core_ops = { > > /* ------------------------------ PAD OPS ------------------------------ */ > > -static int ad9389b_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid > *edid) +static int ad9389b_get_edid(struct v4l2_subdev *sd, struct > v4l2_edid *edid) { > struct ad9389b_state *state = get_ad9389b_state(sd); > > diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c > index ee61894..942ca4b 100644 > --- a/drivers/media/i2c/adv7511.c > +++ b/drivers/media/i2c/adv7511.c > @@ -597,7 +597,7 @@ static int adv7511_isr(struct v4l2_subdev *sd, u32 > status, bool *handled) return 0; > } > > -static int adv7511_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid > *edid) +static int adv7511_get_edid(struct v4l2_subdev *sd, struct > v4l2_edid *edid) { > struct adv7511_state *state = get_adv7511_state(sd); > > diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c > index 71c8570..98cc540 100644 > --- a/drivers/media/i2c/adv7604.c > +++ b/drivers/media/i2c/adv7604.c > @@ -1658,7 +1658,7 @@ static int adv7604_isr(struct v4l2_subdev *sd, u32 > status, bool *handled) return 0; > } > > -static int adv7604_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid > *edid) +static int adv7604_get_edid(struct v4l2_subdev *sd, struct > v4l2_edid *edid) { > struct adv7604_state *state = to_state(sd); > u8 *data = NULL; > @@ -1728,7 +1728,7 @@ static int get_edid_spa_location(const u8 *edid) > return -1; > } > > -static int adv7604_set_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid > *edid) +static int adv7604_set_edid(struct v4l2_subdev *sd, struct > v4l2_edid *edid) { > struct adv7604_state *state = to_state(sd); > int spa_loc; > diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c > index e04fe3f..4d1e07e 100644 > --- a/drivers/media/i2c/adv7842.c > +++ b/drivers/media/i2c/adv7842.c > @@ -2014,7 +2014,7 @@ static int adv7842_isr(struct v4l2_subdev *sd, u32 > status, bool *handled) return 0; > } > > -static int adv7842_get_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid > *edid) +static int adv7842_get_edid(struct v4l2_subdev *sd, struct > v4l2_edid *edid) { > struct adv7842_state *state = to_state(sd); > u8 *data = NULL; > @@ -2054,7 +2054,7 @@ static int adv7842_get_edid(struct v4l2_subdev *sd, > struct v4l2_subdev_edid *edi return 0; > } > > -static int adv7842_set_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid > *e) +static int adv7842_set_edid(struct v4l2_subdev *sd, struct v4l2_edid > *e) { > struct adv7842_state *state = to_state(sd); > int err = 0; -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html