3 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index cea922a8b..875a71383 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -276,7 +276,7 @@ static void saa6752hs_set_params(struct i2c_client* client,
 		h->params.ts_pid_video = params->ts_pid_video;
 	if (params->ts_pid_audio <= MPEG_PID_MAX)
 		h->params.ts_pid_audio = params->ts_pid_audio;
-	
+
 	/* check bitrate parameters */
 	if ((params->vi_bitrate.mode == V4L2_BITRATE_CBR) ||
 	    (params->vi_bitrate.mode == V4L2_BITRATE_VBR))
@@ -289,7 +289,7 @@ static void saa6752hs_set_params(struct i2c_client* client,
 		h->params.vi_bitrate.max = params->vi_bitrate.max;
 	if (params->au_bitrate.mode != V4L2_BITRATE_NONE)
 		h->params.au_bitrate.target = params->au_bitrate.target;
-	
+
 	/* range checks */
 	if (h->params.st_bitrate.target > MPEG_TOTAL_TARGET_BITRATE_MAX)
 		h->params.st_bitrate.target = MPEG_TOTAL_TARGET_BITRATE_MAX;
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c
index af270b581..484bad66b 100644
--- a/linux/drivers/media/video/saa7134/saa7134-core.c
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-core.c,v 1.19 2004/11/19 18:07:12 kraxel Exp $
+ * $Id: saa7134-core.c,v 1.20 2004/11/23 17:29:09 kraxel Exp $
  *
  * device driver for philips saa7134 based TV cards
  * driver core
@@ -913,7 +913,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
 		goto fail1;
 	}
 	dev->lmmio = ioremap(pci_resource_start(pci_dev,0), 0x1000);
-	dev->bmmio = (__u8*)dev->lmmio;
+	dev->bmmio = (__u8 __iomem *)dev->lmmio;
 	if (NULL == dev->lmmio) {
 		err = -EIO;
 		printk(KERN_ERR "%s: can't ioremap() MMIO memory\n",
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index a14445fe4..c621c80f7 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134.h,v 1.30 2004/11/22 18:10:55 kraxel Exp $
+ * $Id: saa7134.h,v 1.31 2004/11/23 17:29:09 kraxel Exp $
  *
  * v4l2 device driver for philips saa7134 based TV cards
  *
@@ -404,8 +404,8 @@ struct saa7134_dev {
 	int                        nr;
 	struct pci_dev             *pci;
 	unsigned char              pci_rev,pci_lat;
-	__u32                      *lmmio;
-	__u8                       *bmmio;
+	__u32                      __iomem *lmmio;
+	__u8                       __iomem *bmmio;
 
 	/* config info */
 	unsigned int               board;