diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 10:21:33 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 10:21:33 +0200 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/isdn/divert/divert_procfs.c | |
| parent | drm: fix drm PCIGART (diff) | |
| parent | Linux v2.6.14-rc5 (diff) | |
| download | linux-312f5726055534be1dc9dd369be13aabd2943fcb.tar.xz linux-312f5726055534be1dc9dd369be13aabd2943fcb.zip | |
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) init_waitqueue_head(&rd_queue); #ifdef CONFIG_PROC_FS - isdn_proc_entry = create_proc_entry("isdn", S_IFDIR | S_IRUGO | S_IXUGO, proc_net); + isdn_proc_entry = proc_mkdir("net/isdn", NULL); if (!isdn_proc_entry) return (-1); isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry); if (!isdn_divert_entry) { - remove_proc_entry("isdn", proc_net); + remove_proc_entry("net/isdn", NULL); return (-1); } isdn_divert_entry->proc_fops = &isdn_fops; @@ -312,7 +312,7 @@ divert_dev_deinit(void) #ifdef CONFIG_PROC_FS remove_proc_entry("divert", isdn_proc_entry); - remove_proc_entry("isdn", proc_net); + remove_proc_entry("net/isdn", NULL); #endif /* CONFIG_PROC_FS */ return (0); |