diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-08 17:16:27 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-08 17:16:27 -0300 |
| commit | 1b0cb8ac7fbb1369e34b40e7cc05c4c948ae4ce1 (patch) | |
| tree | bfa305ec9d664d1562a7bce0fb4c96f7f6b22fef /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | a55bfded81a0bffe5d07618b1983ad4abc6c2fbb (diff) | |
| parent | ffd2e96a4ec0c5aec4c3629ce58c8f0cee88deb0 (diff) | |
| download | mediapointer-dvb-s2-1b0cb8ac7fbb1369e34b40e7cc05c4c948ae4ce1.tar.gz mediapointer-dvb-s2-1b0cb8ac7fbb1369e34b40e7cc05c4c948ae4ce1.tar.bz2 | |
merge: http://linuxtv.org/hg/~manu/dvbmath
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index e3433d894..bdaf6c10b 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -35,6 +35,7 @@ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif +#include <linux/dma-mapping.h> #include "saa7134-reg.h" #include "saa7134.h" @@ -944,7 +945,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, pci_name(pci_dev), dev->pci_rev, pci_dev->irq, dev->pci_lat,pci_resource_start(pci_dev,0)); pci_set_master(pci_dev); - if (!pci_dma_supported(pci_dev,0xffffffff)) { + if (!pci_dma_supported(pci_dev, DMA_32BIT_MASK)) { printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name); err = -EIO; goto fail1; |