aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-09-14 11:53:16 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 12:30:36 -0300
commit3d265c96ccb8f72153b4e926053a79e1a52bf264 (patch)
tree1d72758576c494e491a00d1ad013b55c667ddd0d /drivers/media/video/saa7134
parentV4L/DVB (4634): Zr36120: implement pcipci checks (diff)
downloadlinux-dev-3d265c96ccb8f72153b4e926053a79e1a52bf264.tar.xz
linux-dev-3d265c96ccb8f72153b4e926053a79e1a52bf264.zip
V4L/DVB (4635): Extend bttv and saa7134 to check for both AGP and PCI PCI failure case
We could go and work out if the target object is AGP or PCI but the corner case of an Athlon 64 era box with PCI video is sufficiently unusual it doesn't seem worth the extra work, at least until other cases if any pop up. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index be3a81fc90a2..09aa62f61af7 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -843,7 +843,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
latency = 0x0A;
}
#endif
- if (pci_pci_problems & PCIPCI_FAIL) {
+ if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL)) {
printk(KERN_INFO "%s: quirk: this driver and your "
"chipset may not work together"
" in overlay mode.\n",dev->name);