diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-28 21:20:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-28 21:20:11 -0700 |
| commit | 20c77dc6df3db1dadba222b3ff67048a0deadb2e (patch) | |
| tree | a36b7a7ba12186aaf40c213ab4f7ccceb43354b0 /net/socket.c | |
| parent | 8f518465d73fae2b4f750300166dfcc903908374 (diff) | |
| parent | 4f9889dcc50b60ce14c39d5ba12c9ad4205e840d (diff) | |
Merge master.kernel.org:/home/davem/BK/sctp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
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 53dcf8bf9c83..c9be97e26a5e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -355,7 +355,7 @@ static struct dentry_operations sockfs_dentry_operations = { * but we take care of internal coherence yet. */ -static int sock_map_fd(struct socket *sock) +int sock_map_fd(struct socket *sock) { int fd; struct qstr this; |