diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
| commit | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (patch) | |
| tree | b8cc69814d2368b08d0a84c8da0c12028bd04867 /kernel/sysctl.c | |
| parent | 39fbe47377062200acc26ea0ccef223b4399a82c (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Merge HEAD from /spare/repo/linux-2.6/.git
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 3e0bbee549ea..8e56e2495542 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/smp_lock.h> | 31 | #include <linux/smp_lock.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 34 | #include <linux/net.h> | ||
| 34 | #include <linux/sysrq.h> | 35 | #include <linux/sysrq.h> |
| 35 | #include <linux/highuid.h> | 36 | #include <linux/highuid.h> |
| 36 | #include <linux/writeback.h> | 37 | #include <linux/writeback.h> |
| @@ -136,9 +137,6 @@ static struct ctl_table_header root_table_header = | |||
| 136 | 137 | ||
| 137 | static ctl_table kern_table[]; | 138 | static ctl_table kern_table[]; |
| 138 | static ctl_table vm_table[]; | 139 | static ctl_table vm_table[]; |
| 139 | #ifdef CONFIG_NET | ||
| 140 | extern ctl_table net_table[]; | ||
| 141 | #endif | ||
| 142 | static ctl_table proc_table[]; | 140 | static ctl_table proc_table[]; |
| 143 | static ctl_table fs_table[]; | 141 | static ctl_table fs_table[]; |
| 144 | static ctl_table debug_table[]; | 142 | static ctl_table debug_table[]; |
