3 files changed, 12 insertions, 5 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index e1a22c53e..8ae380526 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-cards.c,v 1.56 2005/07/28 05:21:59 mkrufky Exp $
+    $Id: bttv-cards.c,v 1.57 2005/07/28 18:25:30 mkrufky Exp $
 
     bttv-cards.c
 
@@ -2271,7 +2271,7 @@ struct tvcard bttv_tvcards[] = {
 	.muxsel_hook	= kodicom4400r_muxsel,
 },
 {
-        /* ---- card 0x85---------------------------------- */
+        /* ---- card 0x86---------------------------------- */
         /* Michael Henson <mhenson@clarityvi.com> */
         /* Adlink RTV24 with special unlock codes */
         .name           = "Adlink RTV24",
diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bttv.h
index 97a13422f..bc7b1bafd 100644
--- a/linux/drivers/media/video/bttv.h
+++ b/linux/drivers/media/video/bttv.h
@@ -1,5 +1,5 @@
 /*
- * $Id: bttv.h,v 1.20 2005/07/28 17:36:19 mkrufky Exp $
+ * $Id: bttv.h,v 1.21 2005/07/28 18:25:30 mkrufky Exp $
  *
  *  bttv - Bt848 frame grabber driver
  *
@@ -135,7 +135,7 @@
 #define BTTV_DVICO_DVBT_LITE  0x80
 #define BTTV_TIBET_CS16  0x83
 #define BTTV_KODICOM_4400R  0x84
-#define BTTV_ADLINK_RTV24   0x85
+#define BTTV_ADLINK_RTV24   0x86
 #define BTTV_DVICO_FUSIONHDTV_5_LITE 0x87
 
 /* i2c address list */
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 9dbb2f621..153d6b39e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,5 +1,12 @@
-2005-07-28 18:19  mchehab
+2005-07-28 18:17  mkrufky
+	* bttv.h, bttv-cards.c:
+	- #define BTTV_ADLINK_RTV24
+	  corrected from 0x85 --> 0x86
 
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
+2005-07-28 18:19  mchehab
 	* tuner-core.c:
 	- BTTV does generate some Unimplemented IOCTL log:
 	  0x40046d11(dir=1,tp=0x6d,nr=17,sz=4) means that it is sending