diff options
Diffstat (limited to 'drivers/media/video/bttv-cards.c')
-rw-r--r-- | drivers/media/video/bttv-cards.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index 6c52fd0bb7df..a97b9b958ed6 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
@@ -95,7 +95,7 @@ static int __devinit pvr_boot(struct bttv *btv); | |||
95 | static unsigned int triton1=0; | 95 | static unsigned int triton1=0; |
96 | static unsigned int vsfx=0; | 96 | static unsigned int vsfx=0; |
97 | static unsigned int latency = UNSET; | 97 | static unsigned int latency = UNSET; |
98 | static unsigned int no_overlay=-1; | 98 | int no_overlay=-1; |
99 | 99 | ||
100 | static unsigned int card[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET }; | 100 | static unsigned int card[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET }; |
101 | static unsigned int pll[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET }; | 101 | static unsigned int pll[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET }; |
@@ -4296,9 +4296,11 @@ void __devinit bttv_check_chipset(void) | |||
4296 | printk(KERN_INFO "bttv: Host bridge needs VSFX enabled.\n"); | 4296 | printk(KERN_INFO "bttv: Host bridge needs VSFX enabled.\n"); |
4297 | if (pcipci_fail) { | 4297 | if (pcipci_fail) { |
4298 | printk(KERN_WARNING "bttv: BT848 and your chipset may not work together.\n"); | 4298 | printk(KERN_WARNING "bttv: BT848 and your chipset may not work together.\n"); |
4299 | if (UNSET == no_overlay) { | 4299 | if (!no_overlay) { |
4300 | printk(KERN_WARNING "bttv: going to disable overlay.\n"); | 4300 | printk(KERN_WARNING "bttv: overlay will be disabled.\n"); |
4301 | no_overlay = 1; | 4301 | no_overlay = 1; |
4302 | } else { | ||
4303 | printk(KERN_WARNING "bttv: overlay forced. Use this option at your own risk.\n"); | ||
4302 | } | 4304 | } |
4303 | } | 4305 | } |
4304 | if (UNSET != latency) | 4306 | if (UNSET != latency) |