From 360021f1c887548d17d1961972722d4aa9aaee78 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 7 Aug 2009 07:10:52 -0300 Subject: [PATCH] --- yaml --- r: 156781 b: refs/heads/master c: 99362e1ece9f9651af1b849a01d91b9df1e0db2c h: refs/heads/master i: 156779: d309ec7d16a54c8b13e1f4953bdfe49ace815995 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/hdpvr/hdpvr-video.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 01ff80b748bb..5fdcb10334e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2dd54a54c19d0e5b50f4e1c591653772ead9d4a1 +refs/heads/master: 99362e1ece9f9651af1b849a01d91b9df1e0db2c diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-video.c b/trunk/drivers/media/video/hdpvr/hdpvr-video.c index ccd47f57f42c..d678765cbba2 100644 --- a/trunk/drivers/media/video/hdpvr/hdpvr-video.c +++ b/trunk/drivers/media/video/hdpvr/hdpvr-video.c @@ -1220,6 +1220,8 @@ static const struct video_device hdpvr_video_template = { V4L2_STD_PAL_G | V4L2_STD_PAL_H | V4L2_STD_PAL_I | V4L2_STD_PAL_D | V4L2_STD_PAL_M | V4L2_STD_PAL_N | V4L2_STD_PAL_60, + .current_norm = V4L2_STD_NTSC | V4L2_STD_PAL_M | + V4L2_STD_PAL_60, }; int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,