summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/bttv-driver.c7
-rw-r--r--v4l/ChangeLog7
2 files changed, 12 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index f15642fcf..ecc888513 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.51 2005/08/03 21:14:01 mchehab Exp $
+ $Id: bttv-driver.c,v 1.52 2005/08/04 00:55:16 mchehab Exp $
bttv - Bt848 frame grabber driver
@@ -3793,8 +3793,11 @@ static void bttv_unregister_video(struct bttv *btv)
/* register video4linux devices */
static int __devinit bttv_register_video(struct bttv *btv)
{
- if (no_overlay <= 0)
+ if (no_overlay <= 0) {
bttv_video_template.type |= VID_TYPE_OVERLAY;
+ } else {
+ printk("bttv: Overlay support disabled.\n");
+ }
/* video */
btv->video_dev = vdev_init(btv, &bttv_video_template, "video");
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index c6a6aa9fb..1edfabe84 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-04 00:51 mchehab
+
+ * bttv-driver.c:
+ - New debug warn when no_overlay active.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-08-03 21:10 mchehab
* bttv-cards, bttv-driver.c: