summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-core.c2
-rw-r--r--v4l/ChangeLog7
2 files changed, 8 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c
index df97316cf..e267b89fd 100644
--- a/linux/drivers/media/video/cx25840/cx25840-core.c
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c
@@ -352,7 +352,7 @@ static int set_v4lstd(struct i2c_client *client, v4l2_std_id std)
fmt=0x2;
break;
}
- if (std & V4L2_STD_NTSC_M_443) {
+ if (std & V4L2_STD_NTSC_443) {
fmt=0x3;
break;
}
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 4b2eed21d..f3e479a51 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-17 22:04 mkrufky
+
+ * linux/drivers/media/video/cx25840/cx25840-core.c: (set_v4lstd):
+ - fix build error.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-12-17 21:27 mchehab
* linux/drivers/media/video/cx25840/cx25840-core.c: (set_v4lstd):