fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / atm / proc.c

diff --git a/net/atm/proc.c b/net/atm/proc.c
index 4041054..739866b 100644 (file)
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -8,7 +8,6 @@
  * the reader.
  */
 
-#include <linux/config.h>
 #include <linux/module.h> /* for EXPORT_SYMBOL */
 #include <linux/string.h>
 #include <linux/types.h>
@@ -394,7 +393,7 @@ static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,
        if (count == 0) return 0;
        page = get_zeroed_page(GFP_KERNEL);
        if (!page) return -ENOMEM;
-       dev = PDE(file->f_dentry->d_inode)->data;
+       dev = PDE(file->f_path.dentry->d_inode)->data;
        if (!dev->ops->proc_read)
                length = -EINVAL;
        else {
@@ -508,7 +507,7 @@ err_out:
        goto out;
 }
 
-void __exit atm_proc_exit(void)
+void atm_proc_exit(void)
 {
        atm_proc_dirs_remove();
 }