diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 19:06:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 19:06:04 -0400 |
| commit | cf2f7d7c90279cdbc12429de278f3d27ac2050ae (patch) | |
| tree | c84bb54712f566e6497ccadd1ae9f42b4baf0c63 /drivers/net/wireless/airo.c | |
| parent | 53d8f67082c9b86699dd88b7f9e667e245193f21 (diff) | |
| parent | a9caa3de249a6c43bc9c6aec87881f09276677e3 (diff) | |
Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc
* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
Revert "proc: revert /proc/uptime to ->read_proc hook"
proc 2/2: remove struct proc_dir_entry::owner
proc 1/2: do PDE usecounting even for ->read_proc, ->write_proc
proc: fix sparse warnings in pagemap_read()
proc: move fs/proc/inode-alloc.txt comment into a source file
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 7e80aba8a148..31b1cc2b778a 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -4494,7 +4494,6 @@ static int setup_proc_entry( struct net_device *dev, | |||
| 4494 | goto fail; | 4494 | goto fail; |
| 4495 | apriv->proc_entry->uid = proc_uid; | 4495 | apriv->proc_entry->uid = proc_uid; |
| 4496 | apriv->proc_entry->gid = proc_gid; | 4496 | apriv->proc_entry->gid = proc_gid; |
| 4497 | apriv->proc_entry->owner = THIS_MODULE; | ||
| 4498 | 4497 | ||
| 4499 | /* Setup the StatsDelta */ | 4498 | /* Setup the StatsDelta */ |
| 4500 | entry = proc_create_data("StatsDelta", | 4499 | entry = proc_create_data("StatsDelta", |