diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /fs/inotify.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'fs/inotify.c')
| -rw-r--r-- | fs/inotify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inotify.c b/fs/inotify.c index f48a3dae0712..367c487c014b 100644 --- a/fs/inotify.c +++ b/fs/inotify.c | |||
| @@ -920,7 +920,7 @@ static long inotify_ioctl(struct file *file, unsigned int cmd, | |||
| 920 | return ret; | 920 | return ret; |
| 921 | } | 921 | } |
| 922 | 922 | ||
| 923 | static struct file_operations inotify_fops = { | 923 | static const struct file_operations inotify_fops = { |
| 924 | .poll = inotify_poll, | 924 | .poll = inotify_poll, |
| 925 | .read = inotify_read, | 925 | .read = inotify_read, |
| 926 | .release = inotify_release, | 926 | .release = inotify_release, |