Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge

1 files changed, 2 insertions, 3 deletions

diff --git a/net/sctp/objcnt.c b/net/sctp/objcnt.c
index 14e294e37626..cfeb07ea1b04 100644
--- a/net/sctp/objcnt.c
+++ b/net/sctp/objcnt.c
@@ -132,12 +132,11 @@ void sctp_dbg_objcnt_init(void)
 {
         struct proc_dir_entry *ent;
 
-        ent = create_proc_entry("sctp_dbg_objcnt", 0, proc_net_sctp);
+        ent = proc_create("sctp_dbg_objcnt", 0,
+                          proc_net_sctp, &sctp_objcnt_ops);
         if (!ent)
                 printk(KERN_WARNING
                         "sctp_dbg_objcnt: Unable to create /proc entry.\n");
-        else
-                ent->proc_fops = &sctp_objcnt_ops;
 }
 
 /* Cleanup the objcount entry in the proc filesystem.  */