diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/unix | |
parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
download | linux-next-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.gz |
Merge branch 'master' into upstream
Diffstat (limited to 'net/unix')
-rw-r--r-- | net/unix/garbage.c | 1 | ||||
-rw-r--r-- | net/unix/sysctl_net_unix.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index f8bcf5d114d9..f20b7ea7c555 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -65,7 +65,6 @@ */ #include <linux/kernel.h> -#include <linux/sched.h> #include <linux/string.h> #include <linux/socket.h> #include <linux/un.h> diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 690ffa5d5bfb..eb0bd57ebada 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c @@ -50,7 +50,7 @@ static struct ctl_table_header * unix_sysctl_header; void unix_sysctl_register(void) { - unix_sysctl_header = register_sysctl_table(unix_root_table, 0); + unix_sysctl_header = register_sysctl_table(unix_root_table); } void unix_sysctl_unregister(void) |