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/debugfs/inode.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/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; |