diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-19 11:24:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-19 11:24:06 -0700 |
| commit | 4805347c1eb12cfe79f42a12a5442ee01590a9c0 (patch) | |
| tree | cb9d8b3cfc78d8411f0cea7b06c6472cdd35bb9a /net/netfilter/ipvs | |
| parent | e1943424e43974f85b82bb31eaf832823bf49ce7 (diff) | |
| parent | 91eb7c08c6cb3b8eeba1c61f5753c56dcb77f018 (diff) | |
| download | lwn-4805347c1eb12cfe79f42a12a5442ee01590a9c0.tar.gz lwn-4805347c1eb12cfe79f42a12a5442ee01590a9c0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/netfilter/ipvs')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index ae47090bf45f..9930f340908a 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -1984,9 +1984,6 @@ static const struct file_operations ip_vs_info_fops = { .release = seq_release_private, }; -#endif - -#ifdef CONFIG_PROC_FS static int ip_vs_stats_show(struct seq_file *seq, void *v) { struct net *net = seq_file_single_net(seq); |