From 68c326429df02b54cf48f87a549218ac3ff94709 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 6 Sep 2008 14:02:43 -0300
Subject: [PATCH] --- yaml --- r: 113919 b: refs/heads/master c:
 2796073a3d9cc4f610f1e68b3f62c197d86577ab h: refs/heads/master i:   113917:
 ab4bcf4d1564fd320fc3aa3e73a6d44206fcb645   113915:
 0941e38c05add02b049a89049f27ab7feea7b9e5   113911:
 2c9e1ee37385a098b61548aa7f8fdc88c72f2fa4   113903:
 2fb06ffc2f9df1c4ff740442987eb1d628d4c919   113887:
 3639224d6e1d7bfe1cb6ac26dd9028ca47049175   113855:
 9be43e4b47721a67d9693219b4855afffa6ed4f2   113791:
 6eb1a0c4d779aa3f001285aab23804990f97ba88   113663:
 e6a0e50f2abe5324c8482d471a7fd66bbdab35a8 v: v3

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

diff --git a/[refs] b/[refs]
index f1725b2afa9a..a0a3237f7ca9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2a01a0027b29f682c3833d582e2827a4690f661
+refs/heads/master: 2796073a3d9cc4f610f1e68b3f62c197d86577ab
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c
index 202b28190148..4de7b501f207 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.c
+++ b/trunk/drivers/media/video/cx18/cx18-driver.c
@@ -82,7 +82,7 @@ static int mmio_ndelay[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,
 static unsigned cardtype_c = 1;
 static unsigned tuner_c = 1;
 static unsigned radio_c = 1;
-static int mmio_ndelay_c = 1;
+static unsigned mmio_ndelay_c = 1;
 static char pal[] = "--";
 static char secam[] = "--";
 static char ntsc[] = "-";
diff --git a/trunk/drivers/media/video/cx18/cx18-io.c b/trunk/drivers/media/video/cx18/cx18-io.c
index 5d07b0fd8a17..55d1df93292a 100644
--- a/trunk/drivers/media/video/cx18/cx18-io.c
+++ b/trunk/drivers/media/video/cx18/cx18-io.c
@@ -27,7 +27,7 @@
 void cx18_memcpy_fromio(struct cx18 *cx, void *to,
 			const void __iomem *from, unsigned int len)
 {
-	const u8 *src = from;
+	const u8 __iomem *src = from;
 	u8 *dst = to;
 
 	/* Align reads on the CX23418's addresses */
@@ -61,7 +61,7 @@ void cx18_memcpy_fromio(struct cx18 *cx, void *to,
 
 void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count)
 {
-	u8 *dst = addr;
+	u8 __iomem *dst = addr;
 	u16 val2 = val | (val << 8);
 	u32 val4 = val2 | (val2 << 16);