diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
| commit | 27710bf6febe8323f78bceca002ca7d71e5012a7 (patch) | |
| tree | 80a72f385ea28f9f7649363fe5147b3da37f9950 /net/atm/clip.c | |
| parent | 9ef64cb4320df821638b508f79aa8b858cca99f0 (diff) | |
| parent | cad226b8a71f969ad05137e43b48c9e6059a0b9f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/atm/clip.c')
| -rw-r--r-- | net/atm/clip.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index 86b885ec1cbd..d30167c0b48e 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
| @@ -962,9 +962,7 @@ static int __init atm_clip_init(void) | |||
| 962 | { | 962 | { |
| 963 | struct proc_dir_entry *p; | 963 | struct proc_dir_entry *p; |
| 964 | 964 | ||
| 965 | p = create_proc_entry("arp", S_IRUGO, atm_proc_root); | 965 | p = proc_create("arp", S_IRUGO, atm_proc_root, &arp_seq_fops); |
| 966 | if (p) | ||
| 967 | p->proc_fops = &arp_seq_fops; | ||
| 968 | } | 966 | } |
| 969 | #endif | 967 | #endif |
| 970 | 968 | ||