Merge commit 'origin' into devel

1 files changed, 2 insertions, 2 deletions

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 574d9a964176..1b228065e745 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -742,9 +742,9 @@ static int __init br2684_init(void)
 {
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry *p;
-        if ((p = create_proc_entry("br2684", 0, atm_proc_root)) == NULL)
+        p = proc_create("br2684", 0, atm_proc_root, &br2684_proc_ops);
+        if (p == NULL)
                 return -ENOMEM;
-        p->proc_fops = &br2684_proc_ops;
 #endif
         register_atm_ioctl(&br2684_ioctl_ops);
         return 0;