diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /net/socket.c | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index af0205ff56f2..0b14b79c03af 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -328,7 +328,7 @@ static char *sockfs_dname(struct dentry *dentry, char *buffer, int buflen) | |||
| 328 | dentry->d_inode->i_ino); | 328 | dentry->d_inode->i_ino); |
| 329 | } | 329 | } |
| 330 | 330 | ||
| 331 | static struct dentry_operations sockfs_dentry_operations = { | 331 | static const struct dentry_operations sockfs_dentry_operations = { |
| 332 | .d_delete = sockfs_delete_dentry, | 332 | .d_delete = sockfs_delete_dentry, |
| 333 | .d_dname = sockfs_dname, | 333 | .d_dname = sockfs_dname, |
| 334 | }; | 334 | }; |