From a81c5f71befaab1bf315177c921269aa7eabbb42 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@nuerscht.ch>
Date: Tue, 6 Sep 2005 15:17:07 -0700
Subject: [PATCH] --- yaml --- r: 7360 b: refs/heads/master c:
 d013a068a5675ecd8e71f585a44e7af0798a4307 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/media/video/meye.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 061f389542fe..6df52ab905ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b30bbd963ac2606b0377b39c9d148d6eeef7dce
+refs/heads/master: d013a068a5675ecd8e71f585a44e7af0798a4307
diff --git a/trunk/drivers/media/video/meye.c b/trunk/drivers/media/video/meye.c
index fe194012bccf..3f2a882bc20a 100644
--- a/trunk/drivers/media/video/meye.c
+++ b/trunk/drivers/media/video/meye.c
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
+#include <linux/dma-mapping.h>
 
 #include "meye.h"
 #include <linux/meye.h>
@@ -121,7 +122,7 @@ static int ptable_alloc(void)
 	memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
 
 	/* give only 32 bit DMA addresses */
-	if (dma_set_mask(&meye.mchip_dev->dev, 0xffffffff))
+	if (dma_set_mask(&meye.mchip_dev->dev, DMA_32BIT_MASK))
 		return -1;
 
 	meye.mchip_ptable_toc = dma_alloc_coherent(&meye.mchip_dev->dev,