diff --git a/[refs] b/[refs]
index 9590f19ecce5..e764bcbcb73e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75814d87a976cc12675024c0a03e3ac3369465a0
+refs/heads/master: 28cdf76bf0bce757428f84161e3aa510028d47b4
diff --git a/trunk/drivers/video/hecubafb.c b/trunk/drivers/video/hecubafb.c
index ea5a6c9e2c4e..dc12e2d5489e 100644
--- a/trunk/drivers/video/hecubafb.c
+++ b/trunk/drivers/video/hecubafb.c
@@ -214,7 +214,7 @@ static void apollo_send_command(struct hecubafb_par *par, unsigned char data)
 static void hecubafb_dpy_update(struct hecubafb_par *par)
 {
 	int i;
-	unsigned char *buf = par->info->screen_base;
+	unsigned char *buf = (unsigned char __force *)par->info->screen_base;
 
 	apollo_send_command(par, 0xA0);
 
@@ -303,7 +303,7 @@ static ssize_t hecubafb_write(struct file *file, const char __user *buf,
 	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;
@@ -409,7 +409,7 @@ static int __devexit hecubafb_remove(struct platform_device *dev)
 	if (info) {
 		fb_deferred_io_cleanup(info);
 		unregister_framebuffer(info);
-		vfree(info->screen_base);
+		vfree((void __force *)info->screen_base);
 		framebuffer_release(info);
 	}
 	return 0;