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

1 files changed, 2 insertions, 8 deletions

diff --git a/kernel/resource.c b/kernel/resource.c
index cee12cc47cab..74af2d7cb5a1 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -131,14 +131,8 @@ static const struct file_operations proc_iomem_operations = {
 
 static int __init ioresources_init(void)
 {
-        struct proc_dir_entry *entry;
-
-        entry = create_proc_entry("ioports", 0, NULL);
-        if (entry)
-                entry->proc_fops = &proc_ioports_operations;
-        entry = create_proc_entry("iomem", 0, NULL);
-        if (entry)
-                entry->proc_fops = &proc_iomem_operations;
+        proc_create("ioports", 0, NULL, &proc_ioports_operations);
+        proc_create("iomem", 0, NULL, &proc_iomem_operations);
         return 0;
 }
 __initcall(ioresources_init);