diff options
| author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
| commit | 1b7f6a626f0ff511c3840678466cbfe1d62c0b29 (patch) | |
| tree | 415e8c838c0067bff384afb8a2c91e5f7c6d11d3 /fs/nfs/sysctl.c | |
| parent | b3edc9cec07ade41aaf1804f7c9e876afa90c862 (diff) | |
| parent | 3f5a6ca31c334011fd929501a078424c0d3f71be (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/nfs/sysctl.c')
| -rw-r--r-- | fs/nfs/sysctl.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index 2fe3403c2409..3ea50ac64820 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c | |||
| @@ -18,11 +18,6 @@ | |||
| 18 | static const int nfs_set_port_min = 0; | 18 | static const int nfs_set_port_min = 0; |
| 19 | static const int nfs_set_port_max = 65535; | 19 | static const int nfs_set_port_max = 65535; |
| 20 | static struct ctl_table_header *nfs_callback_sysctl_table; | 20 | static struct ctl_table_header *nfs_callback_sysctl_table; |
| 21 | /* | ||
| 22 | * Something that isn't CTL_ANY, CTL_NONE or a value that may clash. | ||
| 23 | * Use the same values as fs/lockd/svc.c | ||
| 24 | */ | ||
| 25 | #define CTL_UNNUMBERED -2 | ||
| 26 | 21 | ||
| 27 | static ctl_table nfs_cb_sysctls[] = { | 22 | static ctl_table nfs_cb_sysctls[] = { |
| 28 | #ifdef CONFIG_NFS_V4 | 23 | #ifdef CONFIG_NFS_V4 |