From: Al Viro <viro@ftp.linux.org.uk>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/zorro/proc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/zorro/proc.c~m68k-zorro-__user-annotations drivers/zorro/proc.c
--- devel/drivers/zorro/proc.c~m68k-zorro-__user-annotations	2006-01-04 22:24:43.000000000 -0800
+++ devel-akpm/drivers/zorro/proc.c	2006-01-04 22:24:43.000000000 -0800
@@ -45,7 +45,7 @@ proc_bus_zorro_lseek(struct file *file, 
 }
 
 static ssize_t
-proc_bus_zorro_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos)
+proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 {
 	struct inode *ino = file->f_dentry->d_inode;
 	struct proc_dir_entry *dp = PDE(ino);
_