Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6] / drivers / parisc / eisa_eeprom.c

diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index 3a1b4826e5c16b41ba31082cc8f5fc074503833d..e13aafa70bf528d0401770c88b3bce7815f4e35f 100644 (file)
--- a/drivers/parisc/eisa_eeprom.c
+++ b/drivers/parisc/eisa_eeprom.c
@@ -48,7 +48,7 @@ static loff_t eisa_eeprom_llseek(struct file *file, loff_t offset, int origin )
 }
 
 static ssize_t eisa_eeprom_read(struct file * file,
-                             char *buf, size_t count, loff_t *ppos )
+                             char __user *buf, size_t count, loff_t *ppos )
 {
        unsigned char *tmp;
        ssize_t ret;