lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ../net-2.6/

Browse Source 
Conflicts:

	net/ipv6/ndisc.c
This commit is contained in:
David S. Miller
2008-03-23 22:54:03 -07:00
parent 9bd512f619 8f3ea33a50
commit 06802a819a
12 changed files with 43 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/atm/lec.c
View File

@ -1225,6 +1225,10 @@ static int __init lane_module_init(void)
struct proc_dir_entry *p;
p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops);
if (!p) {
printk(KERN_ERR "Unable to initialize /proc/net/atm/lec\n");
return -ENOMEM;
}
#endif
register_atm_ioctl(&lane_ioctl_ops);