diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 03:49:19 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 03:49:19 +0400 |
| commit | 879f99ef2c4c05d9a7f0a67a05f1415663119825 (patch) | |
| tree | 0399664761f675eef741f8b08b92635069586151 /drivers/media/i2c/ad9389b.c | |
| parent | 70a26071f8552a0f193cf442f424decfe0f2e569 (diff) | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c (diff) | |
| download | linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.tar.xz | |
Merge tag 'v3.15-rc5' into next
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
Diffstat (limited to 'drivers/media/i2c/ad9389b.c')
| -rw-r--r-- | drivers/media/i2c/ad9389b.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/ad9389b.c b/drivers/media/i2c/ad9389b.c index 83225d6a0dd9..1b7ecfd88673 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); |