diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
| commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
| tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /fs/udf/dir.c | |
| parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/udf/dir.c')
| -rw-r--r-- | fs/udf/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/dir.c b/fs/udf/dir.c index f5222527fe39..8c28efa3b8ff 100644 --- a/fs/udf/dir.c +++ b/fs/udf/dir.c | |||
| @@ -42,7 +42,7 @@ static int do_udf_readdir(struct inode *, struct file *, filldir_t, void *); | |||
| 42 | 42 | ||
| 43 | /* readdir and lookup functions */ | 43 | /* readdir and lookup functions */ |
| 44 | 44 | ||
| 45 | struct file_operations udf_dir_operations = { | 45 | const struct file_operations udf_dir_operations = { |
| 46 | .read = generic_read_dir, | 46 | .read = generic_read_dir, |
| 47 | .readdir = udf_readdir, | 47 | .readdir = udf_readdir, |
| 48 | .ioctl = udf_ioctl, | 48 | .ioctl = udf_ioctl, |