aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm/lec.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-03-24 01:54:03 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-24 01:54:03 -0400
commit06802a819a0a2d31c952c0624cea6cd00e4e50da (patch)
tree8ccd7c668c7fbd8f08cb89426006040217caf3f1 /net/atm/lec.c
parent9bd512f619cc116b7830134d7c9f6e404a38c7bf (diff)
parent8f3ea33a5078a09eba12bfe57424507809367756 (diff)
Merge branch 'master' of ../net-2.6/
Conflicts: net/ipv6/ndisc.c
Diffstat (limited to 'net/atm/lec.c')
-rw-r--r--net/atm/lec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c
index e2d800d818e3..aa3785ebf6d1 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1225,6 +1225,10 @@ static int __init lane_module_init(void)
1225 struct proc_dir_entry *p; 1225 struct proc_dir_entry *p;
1226 1226
1227 p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops); 1227 p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops);
1228 if (!p) {
1229 printk(KERN_ERR "Unable to initialize /proc/net/atm/lec\n");
1230 return -ENOMEM;
1231 }
1228#endif 1232#endif
1229 1233
1230 register_atm_ioctl(&lane_ioctl_ops); 1234 register_atm_ioctl(&lane_ioctl_ops);