diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:56:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:56:15 -0300 |
| commit | cdc52d7eea48a1afe4d9d701bd37d0867568d380 (patch) | |
| tree | 882a959e8f08e9e81f7bd16c7ec85f6366e8b45f /linux/drivers/media/dvb/pluto2/pluto2.c | |
| parent | 89e2fea073c15a3f72ec74c3859e7a3b271e7db3 (diff) | |
| parent | 63a0b3264ab017fbbf6ac2fcbe17393ff0afae99 (diff) | |
| download | mediapointer-dvb-s2-cdc52d7eea48a1afe4d9d701bd37d0867568d380.tar.gz mediapointer-dvb-s2-cdc52d7eea48a1afe4d9d701bd37d0867568d380.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/pluto2/pluto2.c')
| -rw-r--r-- | linux/drivers/media/dvb/pluto2/pluto2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/pluto2/pluto2.c b/linux/drivers/media/dvb/pluto2/pluto2.c index d654d872e..cb368e2e0 100644 --- a/linux/drivers/media/dvb/pluto2/pluto2.c +++ b/linux/drivers/media/dvb/pluto2/pluto2.c @@ -242,7 +242,11 @@ static int __devinit pluto_dma_map(struct pluto *pluto) pluto->dma_addr = pci_map_single(pluto->pdev, pluto->dma_buf, TS_DMA_BYTES, PCI_DMA_FROMDEVICE); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) return pci_dma_mapping_error(pluto->dma_addr); +#else + return pci_dma_mapping_error(pluto->pdev, pluto->dma_addr); +#endif } static void pluto_dma_unmap(struct pluto *pluto) |