diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-30 12:39:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-30 12:39:15 -0400 |
commit | 5ffd1a6aaacc25be8cd0770a51ec6d46add3a276 (patch) | |
tree | 5b076c44f8b7ff88dba9a554d7748c6f083c9071 /drivers/media/video/zoran_card.c | |
parent | 0cd43f83d381c4246a08cd775834833d6fd64805 (diff) | |
parent | 8dd86eebc5315910ebfd9f30f1674254308be4b3 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (180 commits)
V4L/DVB (4641): Trivial: use lowercase letters in hex subsystem ids
V4L/DVB (4639): Cx88: add autodetection for alternate revision of Leadtek PVR
V4L/DVB (4638): Basic DVB-T and analog TV support for the HVR1300.
V4L/DVB (4637): Add a default method for VIDIOC_G_PARM
V4L/DVB (4635): Extend bttv and saa7134 to check for both AGP and PCI PCI failure case
V4L/DVB (4634): Zr36120: implement pcipci checks
V4L/DVB (4632): Zoran: Implement pcipci failure check
V4L/DVB (4631): Av7110: remove V4L2_CAP_VBI_CAPTURE flag
V4L/DVB (4630): Av7110: FW_LOADER depemdency fixed
V4L/DVB (4629): Saa7134: add card support for Proteus Pro 2309
V4L/DVB (4628): Fix VIDIOC_ENUMSTD ioctl in videodev.c
V4L/DVB (4627): Vivi crashes with mplayer
V4L/DVB (4626): On saa7111/7113, LUMA_CTRL need a different value
V4L/DVB (4624): Tvaudio: Replaced kernel_thread() with kthread_run()
V4L/DVB (4622): Copy-paste bug in videodev.c
V4L/DVB (4620): Fix AGC configuration for MOD3000P-based boards
V4L/DVB (4619): Fixes some I2C dependencies on V4L devices
V4L/DVB (4617): Problem with dibusb-mb.c USB IDs
V4L/DVB (4616): [PATCH] Nebula DigiTV USB RC support
V4L/DVB (4614): Export symbol saa7134_tvaudio_setmute from saa7134 for saa7134-alsa
...
Diffstat (limited to 'drivers/media/video/zoran_card.c')
-rw-r--r-- | drivers/media/video/zoran_card.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c index 29f59c36f001..9f21d0ba0f0f 100644 --- a/drivers/media/video/zoran_card.c +++ b/drivers/media/video/zoran_card.c | |||
@@ -1620,10 +1620,10 @@ init_dc10_cards (void) | |||
1620 | dprintk(5, KERN_DEBUG "Jotti is een held!\n"); | 1620 | dprintk(5, KERN_DEBUG "Jotti is een held!\n"); |
1621 | 1621 | ||
1622 | /* some mainboards might not do PCI-PCI data transfer well */ | 1622 | /* some mainboards might not do PCI-PCI data transfer well */ |
1623 | if (pci_pci_problems & PCIPCI_FAIL) { | 1623 | if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL|PCIPCI_ALIMAGIK)) { |
1624 | dprintk(1, | 1624 | dprintk(1, |
1625 | KERN_WARNING | 1625 | KERN_WARNING |
1626 | "%s: chipset may not support reliable PCI-PCI DMA\n", | 1626 | "%s: chipset does not support reliable PCI-PCI DMA\n", |
1627 | ZORAN_NAME); | 1627 | ZORAN_NAME); |
1628 | } | 1628 | } |
1629 | 1629 | ||
@@ -1631,7 +1631,7 @@ init_dc10_cards (void) | |||
1631 | for (i = 0; i < zoran_num; i++) { | 1631 | for (i = 0; i < zoran_num; i++) { |
1632 | struct zoran *zr = &zoran[i]; | 1632 | struct zoran *zr = &zoran[i]; |
1633 | 1633 | ||
1634 | if (pci_pci_problems & PCIPCI_NATOMA && zr->revision <= 1) { | 1634 | if ((pci_pci_problems & PCIPCI_NATOMA) && zr->revision <= 1) { |
1635 | zr->jpg_buffers.need_contiguous = 1; | 1635 | zr->jpg_buffers.need_contiguous = 1; |
1636 | dprintk(1, | 1636 | dprintk(1, |
1637 | KERN_INFO | 1637 | KERN_INFO |