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/debugfs/inode.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'fs/debugfs/inode.c')
-rw-r--r-- | fs/debugfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index d4f1a2cddd47..85d166cdcae4 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
@@ -191,7 +191,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode, | |||
191 | */ | 191 | */ |
192 | struct dentry *debugfs_create_file(const char *name, mode_t mode, | 192 | struct dentry *debugfs_create_file(const char *name, mode_t mode, |
193 | struct dentry *parent, void *data, | 193 | struct dentry *parent, void *data, |
194 | struct file_operations *fops) | 194 | const struct file_operations *fops) |
195 | { | 195 | { |
196 | struct dentry *dentry = NULL; | 196 | struct dentry *dentry = NULL; |
197 | int error; | 197 | int error; |