diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-28 13:10:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-28 13:10:41 -0300 |
| commit | 7f0a5ef53fcd9c111e1f790d953c4f94ad9b181c (patch) | |
| tree | 5e9e367ef9b0edf36dcca6d6dcb0d67a5f3bea6e /linux/drivers/media/dvb/pluto2/pluto2.c | |
| parent | b56bf8a6147de81da31ee2fde96fe8367386383c (diff) | |
| parent | c0f201cc9dd7be8c8951ecf09e97b783ff10b9b2 (diff) | |
| download | mediapointer-dvb-s2-7f0a5ef53fcd9c111e1f790d953c4f94ad9b181c.tar.gz mediapointer-dvb-s2-7f0a5ef53fcd9c111e1f790d953c4f94ad9b181c.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/woodbury
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) |