diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-23 09:24:10 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-23 09:24:10 -0400 |
| commit | d9214556b11a8d18ff588e60824c12041d30f791 (patch) | |
| tree | 04ab59d13961675811a55c96fb12b2b167b72318 /net/socket.c | |
| parent | 72a1419a9d4c859a3345e4b83f8ef7d599d3818c (diff) | |
| parent | e82c6106b04b85879d802bbbeaed30d9b10a92e2 (diff) | |
Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-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 3e8d4e35c08f..2b7a4b5c9b72 100644 --- 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, | |||
| 1142 | 1142 | ||
| 1143 | sock->type = type; | 1143 | sock->type = type; |
| 1144 | 1144 | ||
| 1145 | #if defined(CONFIG_KMOD) | 1145 | #ifdef CONFIG_MODULES |
| 1146 | /* Attempt to load a protocol module if the find failed. | 1146 | /* Attempt to load a protocol module if the find failed. |
| 1147 | * | 1147 | * |
| 1148 | * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user | 1148 | * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user |