diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
| commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
| tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /fs/ncpfs/file.c | |
| parent | 825f9075d74028d11d7f5932f04e1b5db3022b51 (diff) | |
| parent | d834c16516d1ebec4766fc58c059bf01311e6045 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/ncpfs/file.c')
| -rw-r--r-- | fs/ncpfs/file.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index e6b7c67cf057..df37524b85db 100644 --- a/fs/ncpfs/file.c +++ b/fs/ncpfs/file.c | |||
| @@ -289,6 +289,9 @@ const struct file_operations ncp_file_operations = | |||
| 289 | .read = ncp_file_read, | 289 | .read = ncp_file_read, |
| 290 | .write = ncp_file_write, | 290 | .write = ncp_file_write, |
| 291 | .ioctl = ncp_ioctl, | 291 | .ioctl = ncp_ioctl, |
| 292 | #ifdef CONFIG_COMPAT | ||
| 293 | .compat_ioctl = ncp_compat_ioctl, | ||
| 294 | #endif | ||
| 292 | .mmap = ncp_mmap, | 295 | .mmap = ncp_mmap, |
| 293 | .release = ncp_release, | 296 | .release = ncp_release, |
| 294 | .fsync = ncp_fsync, | 297 | .fsync = ncp_fsync, |