---

yaml --- r: 113919 b: refs/heads/master c: 2796073 h: refs/heads/master i: 113917: ab4bcf4 113915: 0941e38 113911: 2c9e1ee 113903: 2fb06ff 113887: 3639224 113855: 9be43e4 113791: 6eb1a0c 113663: e6a0e50 v: v3
git-mirror · Oct 12, 2008 · 68c3264 · 68c3264
1 parent a95ae53
commit 68c3264
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);