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

into home.osdl.org:/home/torvalds/v2.5/linux

drivers/sbus/char/riowatchdog.c

@@ -194,17 +194,11 @@ static ssize_t riowd_write(struct file *file, const char *buf, size_t count, lof
 	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 = {
 	.owner =	THIS_MODULE,
 	.ioctl =	riowd_ioctl,
 	.open =		riowd_open,
 	.write =	riowd_write,
-	.read =		riowd_read,
 	.release =	riowd_release,
 };