summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-07-08 13:20:33 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-07-08 13:20:33 +0000
commit5c0b48f015db129328d61f4220d1b9b50638a10d (patch)
tree3329dd09b0fd930c5c06445c88070c6ebf52d349
parent8079b4d3f382eb7745ec8a3fa4bfa54e696efc26 (diff)
downloadmediapointer-dvb-s2-5c0b48f015db129328d61f4220d1b9b50638a10d.tar.gz
mediapointer-dvb-s2-5c0b48f015db129328d61f4220d1b9b50638a10d.tar.bz2
* tuner-core.c:
-removed old comment. * .bp/2.6/saa7134-update: - Commented more stuff already at dvb-saa7134 Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-rw-r--r--linux/drivers/media/video/tuner-core.c6
-rw-r--r--v4l/.bp/2.6/saa7134-update7
-rw-r--r--v4l/ChangeLog15
3 files changed, 20 insertions, 8 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 9d1e13f67..2b019709b 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: tuner-core.c,v 1.54 2005/07/07 19:37:06 mchehab Exp $
+ * $Id: tuner-core.c,v 1.55 2005/07/08 13:20:33 mchehab Exp $
*
* i2c tv tuner chip device driver
* core core, i.e. kernel interfaces, registering and so on
@@ -24,10 +24,6 @@
#include <media/audiochip.h>
#include "compat.h"
-/*
- * comment line bellow to return to old behavor, where only one I2C device is supported
- */
-
#define UNSET (-1U)
/* standard i2c insmod options */
diff --git a/v4l/.bp/2.6/saa7134-update b/v4l/.bp/2.6/saa7134-update
index 7bda7e3eb..feb6d032a 100644
--- a/v4l/.bp/2.6/saa7134-update
+++ b/v4l/.bp/2.6/saa7134-update
@@ -12,7 +12,8 @@ srcdiff saa7134-ts.c drivers/media/video/saa7134/saa7134-ts.c
srcdiff saa7134-input.c drivers/media/video/saa7134/saa7134-input.c
srcdiff saa7134-empress.c drivers/media/video/saa7134/saa7134-empress.c
-srcdiff saa7134-dvb.c drivers/media/video/saa7134/saa7134-dvb.c
-srcdiff saa6752hs.h include/media/saa6752hs.h
-srcdiff saa6752hs.c drivers/media/video/saa7134/saa6752hs.c
+# Already at dvb-saa7134
+# srcdiff saa7134-dvb.c drivers/media/video/saa7134/saa7134-dvb.c
+# srcdiff saa6752hs.h include/media/saa6752hs.h
+# srcdiff saa6752hs.c drivers/media/video/saa7134/saa6752hs.c
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index c692202fc..c1670f4dc 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,18 @@
+2005-07-08 13:20 mchehab
+ * tuner-core.c:
+ -removed old comment.
+
+ * .bp/2.6/saa7134-update:
+ - Commented more stuff already at dvb-saa7134
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
+2005-07-07 23:32 mchehab
+ * .bp/2.6/saa7134-update:
+ - Commented some stuff already at dvb-saa7134
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-07-07 19:20 mchehab
* tuner-core.c:
- Comment changed to express better when attach_inform is running