diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /net/9p/mod.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'net/9p/mod.c')
| -rw-r--r-- | net/9p/mod.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/mod.c b/net/9p/mod.c index cf8a4128cd5c..72c398275051 100644 --- a/net/9p/mod.c +++ b/net/9p/mod.c | |||
| @@ -139,7 +139,7 @@ void v9fs_put_trans(struct p9_trans_module *m) | |||
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | /** | 141 | /** |
| 142 | * v9fs_init - Initialize module | 142 | * init_p9 - Initialize module |
| 143 | * | 143 | * |
| 144 | */ | 144 | */ |
| 145 | static int __init init_p9(void) | 145 | static int __init init_p9(void) |
| @@ -154,7 +154,7 @@ static int __init init_p9(void) | |||
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | /** | 156 | /** |
| 157 | * v9fs_init - shutdown module | 157 | * exit_p9 - shutdown module |
| 158 | * | 158 | * |
| 159 | */ | 159 | */ |
| 160 | 160 | ||