diff --git a/[refs] b/[refs] index 38e8c3c3dffe..2fc5411e7279 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e41aac41e3856c87fee52c5b8bca71705d15449b +refs/heads/master: 622439270c74f3ad4f69d1417aca4bb3b79514f4 diff --git a/trunk/net/netfilter/nf_log.c b/trunk/net/netfilter/nf_log.c index 573e76a770d9..3e76bd0824a2 100644 --- a/trunk/net/netfilter/nf_log.c +++ b/trunk/net/netfilter/nf_log.c @@ -167,12 +167,12 @@ int __init netfilter_log_init(void) { #ifdef CONFIG_PROC_FS struct proc_dir_entry *pde; + pde = create_proc_entry("nf_log", S_IRUGO, proc_net_netfilter); -#endif if (!pde) return -1; pde->proc_fops = &nflog_file_ops; - +#endif return 0; }