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 /net/ieee80211/ieee80211_module.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'net/ieee80211/ieee80211_module.c')
| -rw-r--r-- | net/ieee80211/ieee80211_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c index 03a47343ddc7..6059e9e37123 100644 --- a/net/ieee80211/ieee80211_module.c +++ b/net/ieee80211/ieee80211_module.c | |||
| @@ -230,7 +230,7 @@ static int __init ieee80211_init(void) | |||
| 230 | struct proc_dir_entry *e; | 230 | struct proc_dir_entry *e; |
| 231 | 231 | ||
| 232 | ieee80211_debug_level = debug; | 232 | ieee80211_debug_level = debug; |
| 233 | ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, proc_net); | 233 | ieee80211_proc = proc_mkdir(DRV_NAME, proc_net); |
| 234 | if (ieee80211_proc == NULL) { | 234 | if (ieee80211_proc == NULL) { |
| 235 | IEEE80211_ERROR("Unable to create " DRV_NAME | 235 | IEEE80211_ERROR("Unable to create " DRV_NAME |
| 236 | " proc directory\n"); | 236 | " proc directory\n"); |