Merge branch 'linus' into core/softlockup

[~andy/linux] / net / atm / proc.c

diff --git a/net/atm/proc.c b/net/atm/proc.c
index 49487b313f221cf6394fa2c918fc67858ae1f45f..e7b3b273907d197b1a64ac8d1cd9c1ce0c3edc16 100644 (file)
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -476,7 +476,6 @@ int __init atm_proc_init(void)
                                     atm_proc_root, e->proc_fops);
                if (!dirent)
                        goto err_out_remove;
-               dirent->owner = THIS_MODULE;
                e->dirent = dirent;
        }
        ret = 0;