diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 11:00:06 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 11:00:06 -0500 |
| commit | 61420e147a706ee7c7a902008045547fb2a2a330 (patch) | |
| tree | c5739fe1feac05cac49c96107138520c65f8f657 /drivers/video/arcfb.c | |
| parent | 3d0a59c02303df01848537b3bf938dc11e9a0ded (diff) | |
| parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
| download | kernel-crypto-61420e147a706ee7c7a902008045547fb2a2a330.tar.gz kernel-crypto-61420e147a706ee7c7a902008045547fb2a2a330.tar.xz kernel-crypto-61420e147a706ee7c7a902008045547fb2a2a330.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/video/arcfb.c')
| -rw-r--r-- | drivers/video/arcfb.c | 2 |
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 */ |