diff --git a/[refs] b/[refs] index 52d9dad8ee8f..c319a277f719 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04d35d7324ed35983189bd396db7874a50bbea43 +refs/heads/master: 45dbe9147dcad2b03f9d1397353d6eed9204da02 diff --git a/trunk/drivers/parisc/eisa_eeprom.c b/trunk/drivers/parisc/eisa_eeprom.c index 3a1b4826e5c1..e13aafa70bf5 100644 --- a/trunk/drivers/parisc/eisa_eeprom.c +++ b/trunk/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;