projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-microblaze.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index
3e8d4e3
..
2b7a4b5
100644
(file)
--- a/
net/socket.c
+++ b/
net/socket.c
@@
-1142,7
+1142,7
@@
static int __sock_create(struct net *net, int family, int type, int protocol,
sock->type = type;
-#if
defined(CONFIG_KMOD)
+#if
def CONFIG_MODULES
/* Attempt to load a protocol module if the find failed.
*
* 12/09/1996 Marcin: But! this makes REALLY only sense, if the user