diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-22 12:05:48 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-22 12:05:48 -0400 |
| commit | 2fb20b61550d3c5335e59819ed22734900d4d6e3 (patch) | |
| tree | 5ac7690306a0230b51e79afe5cfd3e6575b98cb1 /net/unix/sysctl_net_unix.c | |
| parent | 23caaf19b11eda7054348452e1618d4512a86907 (diff) | |
| parent | 6da7a2aa899f75116e1a62cef78c358ada9878b7 (diff) | |
Merge branch 'topic/misc' into topic/usb
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
| -rw-r--r-- | net/unix/sysctl_net_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 708f5df6b7f..d095c7be10d 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c | |||
| @@ -31,7 +31,7 @@ static struct ctl_path unix_path[] = { | |||
| 31 | { }, | 31 | { }, |
| 32 | }; | 32 | }; |
| 33 | 33 | ||
| 34 | int unix_sysctl_register(struct net *net) | 34 | int __net_init unix_sysctl_register(struct net *net) |
| 35 | { | 35 | { |
| 36 | struct ctl_table *table; | 36 | struct ctl_table *table; |
| 37 | 37 | ||