diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-24 16:47:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-24 16:47:54 -0400 |
| commit | 31ec97d9cebac804814de298592648f7c18d8281 (patch) | |
| tree | f725fcce0d5a9d6d7bd64b777de0a44e71773d0e /fs | |
| parent | 557eed603159b4e007c57d97fad1333ecebd3c2e (diff) | |
| parent | daf8cf608d57a0b9f22276036e420cc82cf6ab4f (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index f1281339b6fa..f1637f17c37c 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
| @@ -674,6 +674,7 @@ struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode, | |||
| 674 | } | 674 | } |
| 675 | return ent; | 675 | return ent; |
| 676 | } | 676 | } |
| 677 | EXPORT_SYMBOL(proc_mkdir_mode); | ||
| 677 | 678 | ||
| 678 | struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, | 679 | struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, |
| 679 | struct proc_dir_entry *parent) | 680 | struct proc_dir_entry *parent) |