From a94b8132d2209246727be90d2c83ef2e34885548 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Tue, 8 May 2007 00:38:47 -0700
Subject: [PATCH] --- yaml --- r: 54920 b: refs/heads/master c:
 d2e8d369cd92a8bb856ff530fa1e4c03b0e0ff55 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/arcfb.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index df88509009b7..a7abb53de17b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78494dd3442cf6ac5562f684c7073db2818d3afd
+refs/heads/master: d2e8d369cd92a8bb856ff530fa1e4c03b0e0ff55
diff --git a/trunk/drivers/video/arcfb.c b/trunk/drivers/video/arcfb.c
index 30a8369757e7..66e0bd1249e9 100644
--- a/trunk/drivers/video/arcfb.c
+++ b/trunk/drivers/video/arcfb.c
@@ -262,7 +262,8 @@ static void arcfb_lcd_update_page(struct arcfb_par *par, unsigned int upper,
 	ks108_set_yaddr(par, chipindex, upper/8);
 
 	linesize = par->info->var.xres/8;
-	src = par->info->screen_base + (left/8) + (upper * linesize);
+	src = (unsigned char __force *) par->info->screen_base + (left/8) +
+		(upper * linesize);
 	ks108_set_xaddr(par, chipindex, left);
 
 	bitmask=1;
@@ -477,7 +478,7 @@ static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t cou
 	if (count) {
 		char *base_addr;
 
-		base_addr = info->screen_base;
+		base_addr = (char __force *)info->screen_base;
 		count -= copy_from_user(base_addr + p, buf, count);
 		*ppos += count;
 		err = -EFAULT;
@@ -603,7 +604,7 @@ static int arcfb_remove(struct platform_device *dev)
 
 	if (info) {
 		unregister_framebuffer(info);
-		vfree(info->screen_base);
+		vfree((void __force *)info->screen_base);
 		framebuffer_release(info);
 	}
 	return 0;