summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/bttv-cards.c6
-rw-r--r--v4l/ChangeLog6
2 files changed, 9 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index f81c10e0a..19697664a 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.64 2005/08/03 20:21:15 mchehab Exp $
+ $Id: bttv-cards.c,v 1.65 2005/08/03 20:41:04 mkrufky Exp $
bttv-cards.c
@@ -4590,10 +4590,10 @@ void __devinit bttv_check_chipset(void)
if (pcipci_fail) {
printk(KERN_WARNING "bttv: BT848 and your chipset may not work together.\n");
if (!no_overlay) {
- printk(KERN_WARNING "bttv: going to disable overlay.\n");
+ printk(KERN_WARNING "bttv: overlay will be disabled.\n");
no_overlay = 1;
} else {
- printk(KERN_WARNING "bttv: overlay forced. You may suffer some OOPS.\n");
+ printk(KERN_WARNING "bttv: overlay forced. Use this option at your own risk.\n");
}
}
if (UNSET != latency)
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 88d848d54..097b73002 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-03 20:39 mkrufky
+ * bttv-cards.c:
+ - Better wording in debug messages for no_overlay.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-08-03 20:16 mchehab
* bttv-cards.c, bttv-driver.c: