diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
| commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
| tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /net/atm/proc.c | |
| parent | 8b112171734c791afaf43ccc8c6ec492e7006e44 (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/atm/proc.c')
| -rw-r--r-- | net/atm/proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/atm/proc.c b/net/atm/proc.c index 49487b313f22..e7b3b273907d 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c | |||
| @@ -476,7 +476,6 @@ int __init atm_proc_init(void) | |||
| 476 | atm_proc_root, e->proc_fops); | 476 | atm_proc_root, e->proc_fops); |
| 477 | if (!dirent) | 477 | if (!dirent) |
| 478 | goto err_out_remove; | 478 | goto err_out_remove; |
| 479 | dirent->owner = THIS_MODULE; | ||
| 480 | e->dirent = dirent; | 479 | e->dirent = dirent; |
| 481 | } | 480 | } |
| 482 | ret = 0; | 481 | ret = 0; |