diff --git a/[refs] b/[refs]
index f0eb0b57b2f2..b1db53e99f4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd0306656c15f355e0e533cc0f08691bb98ca912
+refs/heads/master: d22043940eb8d660df9a94e8e439ab4d3d16edab
diff --git a/trunk/drivers/video/arcfb.c b/trunk/drivers/video/arcfb.c
index 080db812ca48..2784f0a9d693 100644
--- a/trunk/drivers/video/arcfb.c
+++ b/trunk/drivers/video/arcfb.c
@@ -441,7 +441,7 @@ static int arcfb_ioctl(struct inode *inode, struct file *file,
  * the fb. it's inefficient for them to do anything less than 64*8
  * writes since we update the lcd in each write() anyway.
  */
-static ssize_t arcfb_write(struct file *file, const char *buf, size_t count,
+static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t count,
 				loff_t *ppos)
 {
 	/* modded from epson 1355 */