diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:04:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:04:56 -0300 |
| commit | 29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79 (patch) | |
| tree | 3049a3bbf0ba48fd24b62aaff07ab2925dcb3743 /linux/drivers/media/video/bttv-cards.c | |
| parent | f9533819a70608d97d03abd7766ffc3f1e3ea655 (diff) | |
| parent | 3d611f80a1b8888b9001e1738f24194c694a8bf4 (diff) | |
| download | mediapointer-dvb-s2-29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79.tar.gz mediapointer-dvb-s2-29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79.tar.bz2 | |
Merging mkrufky pvrusb2 tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bttv-cards.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index b46f1118b..47131de0d 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -161,6 +161,8 @@ MODULE_PARM_DESC(card,"specify TV/grabber card model, see CARDLIST file for a li MODULE_PARM_DESC(pll,"specify installed crystal (0=none, 28=28 MHz, 35=35 MHz)"); MODULE_PARM_DESC(tuner,"specify installed tuner type"); MODULE_PARM_DESC(autoload,"automatically load i2c modules like tuner.o, default is 1 (yes)"); +MODULE_PARM_DESC(no_overlay,"allow override overlay default (0 disables, 1 enables)" + " [some VIA/SIS chipsets are known to have problem with overlay]"); /* ----------------------------------------------------------------------- */ /* list of card IDs for bt878+ cards */ @@ -5044,12 +5046,14 @@ void __devinit bttv_check_chipset(void) if (vsfx) printk(KERN_INFO "bttv: Host bridge needs VSFX enabled.\n"); if (pcipci_fail) { - printk(KERN_WARNING "bttv: BT848 and your chipset may not work together.\n"); + printk(KERN_INFO "bttv: bttv and your chipset may not work " + "together.\n"); if (!no_overlay) { - printk(KERN_WARNING "bttv: overlay will be disabled.\n"); + printk(KERN_INFO "bttv: overlay will be disabled.\n"); no_overlay = 1; } else { - printk(KERN_WARNING "bttv: overlay forced. Use this option at your own risk.\n"); + printk(KERN_INFO "bttv: overlay forced. Use this " + "option at your own risk.\n"); } } if (UNSET != latency) |