diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 8 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index db96b792a..ba57d1e58 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.66 2005/08/03 21:14:01 mchehab Exp $ + $Id: bttv-cards.c,v 1.67 2005/08/10 03:53:50 mchehab Exp $ bttv-cards.c @@ -4598,9 +4598,13 @@ void __devinit bttv_check_chipset(void) } if (UNSET != latency) printk(KERN_INFO "bttv: pci latency fixup [%d]\n",latency); - +#ifdef MM_KERNEL + while ((dev = pci_get_device(PCI_VENDOR_ID_INTEL, + PCI_DEVICE_ID_INTEL_82441, dev))) { +#else while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, dev))) { +#endif unsigned char b; pci_read_config_byte(dev, 0x53, &b); if (bttv_debug) diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 3e616bb2a..8e83a6af8 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-08-10 03:50 mchehab + * bttv-cards.c: + - It removes occurence of pci_find_device (depreciated) in the + kernel tree, replacing to to pci_get_device. + Generated in 2.6.13-rc5-mm1 kernel version. + + Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-08-09 18:57 mchehab * cx88-input.c |