diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
| commit | 058250a0d5886b4d96a195ecc7e3a75e2df5e4b1 (patch) | |
| tree | fb67e8f5258c6aa11d4e8c39650e23de7556b38d /fs/proc/root.c | |
| parent | cea218054ad277d6c126890213afde07b4eb1602 (diff) | |
| parent | 2ffbb8377c7a0713baf6644e285adc27a5654582 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index ec9cb3b6c93b..1f86bb860e04 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
| @@ -98,7 +98,7 @@ static void proc_kill_sb(struct super_block *sb) | |||
| 98 | put_pid_ns(ns); | 98 | put_pid_ns(ns); |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static struct file_system_type proc_fs_type = { | 101 | struct file_system_type proc_fs_type = { |
| 102 | .name = "proc", | 102 | .name = "proc", |
| 103 | .get_sb = proc_get_sb, | 103 | .get_sb = proc_get_sb, |
| 104 | .kill_sb = proc_kill_sb, | 104 | .kill_sb = proc_kill_sb, |