Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6-omap-h63xx.git] / fs / proc / proc_net.c

diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 7034facf8b8f553aa211324bbaf1da103f5dda9e..13cd7835d0dfdc5027c61df7270bbb61d51d2273 100644 (file)
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -51,7 +51,6 @@ int seq_open_net(struct inode *ino, struct file *f,
 }
 EXPORT_SYMBOL_GPL(seq_open_net);
 
-#ifdef CONFIG_NET
 int seq_release_net(struct inode *ino, struct file *f)
 {
        struct seq_file *seq;
@@ -219,4 +218,3 @@ int __init proc_net_init(void)
 
        return register_pernet_subsys(&proc_net_ns_ops);
 }
-#endif /* CONFIG_NET */