diff options
author | Paul Mackerras <paulus@samba.org> | 2008-03-13 05:26:33 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 05:26:33 +0100 |
commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
tree | 8f582294a655f70496cd08aedeb86de31dbad140 /net/atm/mpoa_proc.c | |
parent | pasemi_mac: basic ethtool support (diff) | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
download | linux-bed04a4413376265746053be2a9cfbfc80c98ec9.tar.xz linux-bed04a4413376265746053be2a9cfbfc80c98ec9.zip |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/atm/mpoa_proc.c')
-rw-r--r-- | net/atm/mpoa_proc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c index 91f3ffc90dbd..4990541ef5da 100644 --- a/net/atm/mpoa_proc.c +++ b/net/atm/mpoa_proc.c @@ -276,12 +276,11 @@ int mpc_proc_init(void) { struct proc_dir_entry *p; - p = create_proc_entry(STAT_FILE_NAME, 0, atm_proc_root); + p = proc_create(STAT_FILE_NAME, 0, atm_proc_root, &mpc_file_operations); if (!p) { printk(KERN_ERR "Unable to initialize /proc/atm/%s\n", STAT_FILE_NAME); return -ENOMEM; } - p->proc_fops = &mpc_file_operations; p->owner = THIS_MODULE; return 0; } |