diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:07:54 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:07:54 +0200 |
commit | a403e45c3b678211ee3b7225dbb924921fb5ddd3 (patch) | |
tree | 6526d8d3c46f2443c7836bf094366179a57e7aad /fs/jffs2/dir.c | |
parent | a05d2ebab28011c2f3f520833f4bfdd2fd1b9c02 (diff) | |
parent | d974ae379a2fbe8948f01eabbc6b19c0a80f09bc (diff) |
Merge core/lib: pick up memparse() change.
Merge branch 'core/lib' into x86/xen
Diffstat (limited to 'fs/jffs2/dir.c')
-rw-r--r-- | fs/jffs2/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index c0c141f6fde..cd219ef5525 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c @@ -38,7 +38,7 @@ const struct file_operations jffs2_dir_operations = { .read = generic_read_dir, .readdir = jffs2_readdir, - .ioctl = jffs2_ioctl, + .unlocked_ioctl=jffs2_ioctl, .fsync = jffs2_fsync }; |