summaryrefslogtreecommitdiffstats
path: root/fs/sysv/dir.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-12-06 23:51:34 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-12-06 23:51:34 +0000
commit230e5ab6a084ed50470f101934782dbf54b0d06b (patch)
tree5dd821c8d33f450470588e7a543f74bf74306e9e /fs/sysv/dir.c
parentc9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff)
Merge with Linux 2.1.67.
Diffstat (limited to 'fs/sysv/dir.c')
-rw-r--r--fs/sysv/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index ac0bd2923..e93f8bb11 100644
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -21,8 +21,8 @@
#include <asm/uaccess.h>
-static long sysv_dir_read(struct inode * inode, struct file * filp,
- char * buf, unsigned long count)
+static ssize_t sysv_dir_read(struct file * filp, char * buf,
+ size_t count, loff_t *ppos)
{
return -EISDIR;
}