Commit e1237147 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/sparc-2.5

into home.osdl.org:/home/torvalds/v2.5/linux
parents 05b34ae0 b6e0ef09
...@@ -194,17 +194,11 @@ static ssize_t riowd_write(struct file *file, const char *buf, size_t count, lof ...@@ -194,17 +194,11 @@ static ssize_t riowd_write(struct file *file, const char *buf, size_t count, lof
return 0; return 0;
} }
static ssize_t riowd_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
{
return -EINVAL;
}
static struct file_operations riowd_fops = { static struct file_operations riowd_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.ioctl = riowd_ioctl, .ioctl = riowd_ioctl,
.open = riowd_open, .open = riowd_open,
.write = riowd_write, .write = riowd_write,
.read = riowd_read,
.release = riowd_release, .release = riowd_release,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment