aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/arcfb.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-19 00:09:53 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-19 00:09:53 -0500
commit418fbfe979d96efc7b91f29b2085d51541c61f0b (patch)
treea9acb07328e0c76011727d5b3b6f5407afcd2866 /drivers/video/arcfb.c
parent8b132f4ee7304fec4fa27dec67879bc0172e916a (diff)
parentff60dde9e46b87757d5e83bd58be0688fca8e816 (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/video/arcfb.c')
-rw-r--r--drivers/video/arcfb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index 080db812ca4..2784f0a9d69 100644
--- a/drivers/video/arcfb.c
+++ b/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 */