From 5d9d7b28a0fcdb424b62cd193571ec7dd22b5bd6 Mon Sep 17 00:00:00 2001
From: Santosh Nayak <santoshprasadnayak@gmail.com>
Date: Tue, 21 Feb 2012 06:13:31 -0300
Subject: [PATCH] --- yaml --- r: 295035 b: refs/heads/master c:
 3907b019971fdd626b4740664b6bc7ecdedeec54 h: refs/heads/master i:   295033:
 6fb160c5a3773c1f5a9494088b0e2fe802c6dfd2   295031:
 b0a02923f51106aa664e0400be374d33021fe21f v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/cx18/cx18-driver.c | 4 ++--
 trunk/drivers/media/video/ivtv/ivtv-driver.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9819367b610a..4a712b2c1390 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec9ee8e2ddb11deaf2b8c8fc703a86a8f815e64f
+refs/heads/master: 3907b019971fdd626b4740664b6bc7ecdedeec54
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c
index 935574511ff2..b55d57cc1a1c 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.c
+++ b/trunk/drivers/media/video/cx18/cx18-driver.c
@@ -38,7 +38,7 @@
 #include "cx18-ioctl.h"
 #include "cx18-controls.h"
 #include "tuner-xc2028.h"
-
+#include <linux/dma-mapping.h>
 #include <media/tveeprom.h>
 
 /* If you have already X v4l cards, then set this to X. This way
@@ -812,7 +812,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev,
 		CX18_ERR("Can't enable device %d!\n", cx->instance);
 		return -EIO;
 	}
-	if (pci_set_dma_mask(pci_dev, 0xffffffff)) {
+	if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
 		CX18_ERR("No suitable DMA available, card %d\n", cx->instance);
 		return -EIO;
 	}
diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.c b/trunk/drivers/media/video/ivtv/ivtv-driver.c
index 78c44cd3fb6d..679262ed13bc 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-driver.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-driver.c
@@ -55,7 +55,7 @@
 #include "ivtv-routing.h"
 #include "ivtv-controls.h"
 #include "ivtv-gpio.h"
-
+#include <linux/dma-mapping.h>
 #include <media/tveeprom.h>
 #include <media/saa7115.h>
 #include <media/v4l2-chip-ident.h>
@@ -813,7 +813,7 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,
 		IVTV_ERR("Can't enable device!\n");
 		return -EIO;
 	}
-	if (pci_set_dma_mask(pdev, 0xffffffff)) {
+	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
 		IVTV_ERR("No suitable DMA available.\n");
 		return -EIO;
 	}