diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-06-22 22:31:38 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-06-22 22:31:38 +0000 |
| commit | 44d8b9bf4cc9a4680bda3d2e797edb7c9f7f0363 (patch) | |
| tree | b43657dae4734c4f82afa6f23083b4c8b086989f /linux/drivers/media/video/bttv-driver.c | |
| parent | 038f4c24539b60a930858b7e326f7220a40beade (diff) | |
| download | mediapointer-dvb-s2-44d8b9bf4cc9a4680bda3d2e797edb7c9f7f0363.tar.gz mediapointer-dvb-s2-44d8b9bf4cc9a4680bda3d2e797edb7c9f7f0363.tar.bz2 | |
* bttv-driver.h:
- use DMA_32BIT_MASK. Thanks to domen@coderock.org.
* tuner.h:
- Remove unneeded set_tuner from tuner structure.
* saa7134-cards.c, saa7134-tvaudio.c:
patch to switch external mux on mute on some cards.
* tuner-simple:
- unify tuner list
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 1fa396465..014d61398 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.40 2005/06/16 21:38:45 nsh Exp $ + $Id: bttv-driver.c,v 1.41 2005/06/22 22:31:38 nsh Exp $ bttv - Bt848 frame grabber driver @@ -35,6 +35,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> #include <linux/kdev_t.h> +#include <linux/dma-mapping.h> #include <asm/io.h> #include <asm/byteorder.h> @@ -3878,7 +3879,11 @@ static int __devinit bttv_probe(struct pci_dev *dev, btv->c.nr); return -EIO; } +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,7) if (pci_set_dma_mask(dev, 0xffffffff)) { +#else + if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) { +#endif printk(KERN_WARNING "bttv%d: No suitable DMA available.\n", btv->c.nr); return -EIO; |