summaryrefslogtreecommitdiff
path: root/net/socket.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-07-04 08:54:40 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-07-04 08:54:40 -0700
commit75eead62e1de867de280c4edfc24e86cc50577cb (patch)
tree59990c678e78f2928badd292062a1632851a4f4d /net/socket.c
parent78f1f626d9412e572e9e18a06c9989deaede8a9a (diff)
parent88cc0d3e8fc80880372e6900712a6f3f8172286a (diff)
Merge home.transmeta.com:/home/torvalds/v2.5/viro
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index bed470afb5ed..798eeab2f47c 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -465,7 +465,7 @@ struct socket *sock_alloc(void)
if (!inode)
return NULL;
- inode->i_dev = NODEV;
+ inode->i_dev = 0;
sock = SOCKET_I(inode);
inode->i_mode = S_IFSOCK|S_IRWXUGO;