summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-08-03 21:14:01 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-08-03 21:14:01 +0000
commit80a29c512091061eaae7a0eff3d9075f647aaf6d (patch)
tree7858f9b014c9282f7fbfed3d81ded607881e2a6b
parent1ca0e2666f3bf0fbddf7099ab4fa6945a896b28d (diff)
downloadmediapointer-dvb-s2-80a29c512091061eaae7a0eff3d9075f647aaf6d.tar.gz
mediapointer-dvb-s2-80a29c512091061eaae7a0eff3d9075f647aaf6d.tar.bz2
_overlay type changed to int.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-rw-r--r--linux/drivers/media/video/bttv-cards.c4
-rw-r--r--linux/drivers/media/video/bttv-driver.c4
-rw-r--r--v4l/ChangeLog7
3 files changed, 11 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 19697664a..db96b792a 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.65 2005/08/03 20:41:04 mkrufky Exp $
+ $Id: bttv-cards.c,v 1.66 2005/08/03 21:14:01 mchehab Exp $
bttv-cards.c
@@ -98,7 +98,7 @@ static int __devinit pvr_boot(struct bttv *btv);
static unsigned int triton1=0;
static unsigned int vsfx=0;
static unsigned int latency = UNSET;
-unsigned int no_overlay=-1;
+int no_overlay=-1;
static unsigned int card[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
static unsigned int pll[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index a91c59148..f15642fcf 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-driver.c,v 1.50 2005/08/03 20:21:15 mchehab Exp $
+ $Id: bttv-driver.c,v 1.51 2005/08/03 21:14:01 mchehab Exp $
bttv - Bt848 frame grabber driver
@@ -80,7 +80,7 @@ static unsigned int irq_iswitch = 0;
static unsigned int uv_ratio = 50;
static unsigned int full_luma_range = 0;
static unsigned int coring = 0;
-extern unsigned int no_overlay;
+extern int no_overlay;
/* API features (turn on/off stuff for testing) */
static unsigned int v4l2 = 1;
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 097b73002..c6a6aa9fb 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-03 21:10 mchehab
+
+ * bttv-cards, bttv-driver.c:
+ - no_overlay type changed to int.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-08-03 20:39 mkrufky
* bttv-cards.c:
- Better wording in debug messages for no_overlay.