diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/isdn/divert/divert_procfs.c | |
parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/isdn/divert/divert_procfs.c')
-rw-r--r-- | drivers/isdn/divert/divert_procfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c index e1f0d87de0eb..0b0ea26023e5 100644 --- a/drivers/isdn/divert/divert_procfs.c +++ b/drivers/isdn/divert/divert_procfs.c | |||
@@ -287,12 +287,12 @@ divert_dev_init(void) | |||
287 | init_waitqueue_head(&rd_queue); | 287 | init_waitqueue_head(&rd_queue); |
288 | 288 | ||
289 | #ifdef CONFIG_PROC_FS | 289 | #ifdef CONFIG_PROC_FS |
290 | isdn_proc_entry = create_proc_entry("isdn", S_IFDIR | S_IRUGO | S_IXUGO, proc_net); | 290 | isdn_proc_entry = proc_mkdir("net/isdn", NULL); |
291 | if (!isdn_proc_entry) | 291 | if (!isdn_proc_entry) |
292 | return (-1); | 292 | return (-1); |
293 | isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry); | 293 | isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry); |
294 | if (!isdn_divert_entry) { | 294 | if (!isdn_divert_entry) { |
295 | remove_proc_entry("isdn", proc_net); | 295 | remove_proc_entry("net/isdn", NULL); |
296 | return (-1); | 296 | return (-1); |
297 | } | 297 | } |
298 | isdn_divert_entry->proc_fops = &isdn_fops; | 298 | isdn_divert_entry->proc_fops = &isdn_fops; |
@@ -312,7 +312,7 @@ divert_dev_deinit(void) | |||
312 | 312 | ||
313 | #ifdef CONFIG_PROC_FS | 313 | #ifdef CONFIG_PROC_FS |
314 | remove_proc_entry("divert", isdn_proc_entry); | 314 | remove_proc_entry("divert", isdn_proc_entry); |
315 | remove_proc_entry("isdn", proc_net); | 315 | remove_proc_entry("net/isdn", NULL); |
316 | #endif /* CONFIG_PROC_FS */ | 316 | #endif /* CONFIG_PROC_FS */ |
317 | 317 | ||
318 | return (0); | 318 | return (0); |