git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
bttv-cards.c
diff --git
a/drivers/media/video/bttv-cards.c
b/drivers/media/video/bttv-cards.c
index
6c52fd0
..
a97b9b9
100644
(file)
--- 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);
static unsigned int triton1=0;
static unsigned int vsfx=0;
static unsigned int latency = UNSET;
static unsigned int triton1=0;
static unsigned int vsfx=0;
static unsigned int latency = UNSET;
-
static 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 };
static unsigned int card[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
static unsigned int pll[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
@@
-4296,9
+4296,11
@@
void __devinit bttv_check_chipset(void)
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: Host bridge needs VSFX enabled.\n");
if (pcipci_fail) {
printk(KERN_WARNING "bttv: BT848 and your chipset may not work together.\n");
- if (
UNSET ==
no_overlay) {
- printk(KERN_WARNING "bttv:
going to disable overlay
.\n");
+ if (
!
no_overlay) {
+ printk(KERN_WARNING "bttv:
overlay will be disabled
.\n");
no_overlay = 1;
no_overlay = 1;
+ } else {
+ printk(KERN_WARNING "bttv: overlay forced. Use this option at your own risk.\n");
}
}
if (UNSET != latency)
}
}
if (UNSET != latency)