summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/msp3400-driver.c2
-rw-r--r--linux/drivers/media/video/msp3400.c2
-rw-r--r--linux/drivers/media/video/tvaudio.c1
-rw-r--r--linux/include/media/video-buf-dvb.h5
4 files changed, 3 insertions, 7 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 8c88f8f90..b13583860 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1010,7 +1010,7 @@ static int msp34xx_modus(int norm)
{
switch (norm) {
case VIDEO_MODE_PAL:
-#if 1
+#if 1 /*KEEP*/
/* experimental: not sure this works with all chip versions */
return 0x7003;
#else
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 8c88f8f90..b13583860 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1010,7 +1010,7 @@ static int msp34xx_modus(int norm)
{
switch (norm) {
case VIDEO_MODE_PAL:
-#if 1
+#if 1 /*KEEP*/
/* experimental: not sure this works with all chip versions */
return 0x7003;
#else
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index f0d784478..a2e001fb2 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -318,7 +318,6 @@ static int chip_thread(void *data)
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
try_to_freeze();
#endif
-
if (chip->done || signal_pending(current))
break;
tvaudio_dbg("%s: thread wakeup\n", i2c_clientname(&chip->c));
diff --git a/linux/include/media/video-buf-dvb.h b/linux/include/media/video-buf-dvb.h
index 848459f79..94d16e0ed 100644
--- a/linux/include/media/video-buf-dvb.h
+++ b/linux/include/media/video-buf-dvb.h
@@ -1,7 +1,4 @@
-/*
- * $Id: video-buf-dvb.h,v 1.7 2005/06/18 04:00:19 mkrufky Exp $
- */
-
+/* $Id: video-buf-dvb.h,v 1.8 2005/09/04 11:45:19 mchehab Exp $ */
#include <dvbdev.h>
#include <dmxdev.h>
#include <dvb_demux.h>