aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 18:23:50 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 18:23:50 -0400
commit6dfce901a450534d046b7950682243d5fb665783 (patch)
tree896572d34cc4c5149dcd83a260018d22d7f58dce /fs
parent96a6099d2fb448cc06401386c7703a6ca015ac3d (diff)
parent10fa16e75c70c8e7ec4675c5f985548a6565dca2 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: fix debug compilation error
Diffstat (limited to 'fs')
-rw-r--r--fs/9p/v9fs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 45c35986d49f..0a7068e30ecb 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -131,7 +131,9 @@ static void v9fs_parse_options(char *options, struct v9fs_session_info *v9ses)
131 switch (token) { 131 switch (token) {
132 case Opt_debug: 132 case Opt_debug:
133 v9ses->debug = option; 133 v9ses->debug = option;
134#ifdef CONFIG_NET_9P_DEBUG
134 p9_debug_level = option; 135 p9_debug_level = option;
136#endif
135 break; 137 break;
136 case Opt_port: 138 case Opt_port:
137 v9ses->port = option; 139 v9ses->port = option;