aboutsummaryrefslogtreecommitdiffstats
path: root/fs/affs
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-09-04 08:09:09 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-09-04 08:09:09 -0700
commit0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1 (patch)
tree29cec0edf3acf18c6978b750a8d6560f445df6df /fs/affs
parent1625324d22409e32e3f8eb86018cad72e1c09d61 (diff)
parentec0c15afb41fd9ad45b53468b60db50170e22346 (diff)
downloadkernel_samsung_aries-0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1.zip
kernel_samsung_aries-0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1.tar.gz
kernel_samsung_aries-0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1.tar.bz2
Merge branch 'linus' into x86/core
Diffstat (limited to 'fs/affs')
-rw-r--r--fs/affs/dir.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/affs/dir.c b/fs/affs/dir.c
index 6e3f282..7b36904 100644
--- a/fs/affs/dir.c
+++ b/fs/affs/dir.c
@@ -19,6 +19,7 @@ static int affs_readdir(struct file *, void *, filldir_t);
const struct file_operations affs_dir_operations = {
.read = generic_read_dir,
+ .llseek = generic_file_llseek,
.readdir = affs_readdir,
.fsync = file_fsync,
};