diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
| commit | 7ad3423ebb02f340671f70a916bdc8dbec7573ee (patch) | |
| tree | b9168d363c24f2af2626e63011ec1f6c81e81d09 /drivers/media/v4l2-core/v4l2-dv-timings.c | |
| parent | 56a23ee52611ca76421f3d7cac100e1616716dae (diff) | |
| parent | 44be77c590f381bc629815ac789b8b15ecc4ddcf (diff) | |
| download | talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.tar.gz talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.zip | |
Merge branch 'for-linus' into for-next
Back-merge the upstream branch for applying further cleanup patches
for HD-Audio.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-dv-timings.c')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-dv-timings.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c index 5c8c49d240d1..930f9c53a64e 100644 --- a/drivers/media/v4l2-core/v4l2-dv-timings.c +++ b/drivers/media/v4l2-core/v4l2-dv-timings.c @@ -245,11 +245,11 @@ EXPORT_SYMBOL_GPL(v4l2_find_dv_timings_cea861_vic); /** * v4l2_match_dv_timings - check if two timings match - * @t1 - compare this v4l2_dv_timings struct... - * @t2 - with this struct. - * @pclock_delta - the allowed pixelclock deviation. - * @match_reduced_fps - if true, then fail if V4L2_DV_FL_REDUCED_FPS does not - * match. + * @t1: compare this v4l2_dv_timings struct... + * @t2: with this struct. + * @pclock_delta: the allowed pixelclock deviation. + * @match_reduced_fps: if true, then fail if V4L2_DV_FL_REDUCED_FPS does not + * match. * * Compare t1 with t2 with a given margin of error for the pixelclock. */ |
