diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
| commit | 13df7977431e3b906a23bb75f29e0f40a8d73f87 (patch) | |
| tree | bc2c78c3b816a65f90c31cccebdc15b38352c045 /drivers/net/wireless/hostap/hostap_proc.c | |
| parent | 6d8b3e1ad3d3815d9c87b8553493301e243af76a (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_proc.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c index aa7ad3a7a69b..4e5c0f8c9496 100644 --- a/drivers/net/wireless/hostap/hostap_proc.c +++ b/drivers/net/wireless/hostap/hostap_proc.c | |||
| @@ -496,7 +496,7 @@ void hostap_init_proc(local_info_t *local) | |||
| 496 | 496 | ||
| 497 | void hostap_remove_proc(local_info_t *local) | 497 | void hostap_remove_proc(local_info_t *local) |
| 498 | { | 498 | { |
| 499 | remove_proc_subtree(local->ddev->name, hostap_proc); | 499 | proc_remove(local->proc); |
| 500 | } | 500 | } |
| 501 | 501 | ||
| 502 | 502 | ||