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, 6 deletions

diff --git a/kernel/dma.c b/kernel/dma.c
index 6a82bb716dac..d2c60a822790 100644
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -149,12 +149,7 @@ static const struct file_operations proc_dma_operations = {
 
 static int __init proc_dma_init(void)
 {
-        struct proc_dir_entry *e;
-
-        e = create_proc_entry("dma", 0, NULL);
-        if (e)
-                e->proc_fops = &proc_dma_operations;
-
+        proc_create("dma", 0, NULL, &proc_dma_operations);
         return 0;
 }