Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

1 files changed, 1 insertions, 4 deletions

diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
index 417da8c5bc72..c994530d166d 100644
--- a/kernel/time/timer_stats.c
+++ b/kernel/time/timer_stats.c
@@ -415,12 +415,9 @@ static int __init init_tstats_procfs(void)
 {
         struct proc_dir_entry *pe;
 
-        pe = create_proc_entry("timer_stats", 0644, NULL);
+        pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
         if (!pe)
                 return -ENOMEM;
-
-        pe->proc_fops = &tstats_fops;
-
         return 0;
 }
 __initcall(init_tstats_procfs);