summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 00:23:50 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 00:23:50 +0200
commit6dfce901a450534d046b7950682243d5fb665783 (patch)
tree896572d34cc4c5149dcd83a260018d22d7f58dce
parentMerge branch 'isdn-cleanup' of master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff)
parent9p: fix debug compilation error (diff)
downloadlinux-6dfce901a450534d046b7950682243d5fb665783.tar.xz
linux-6dfce901a450534d046b7950682243d5fb665783.zip
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
-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)
switch (token) {
case Opt_debug:
v9ses->debug = option;
+#ifdef CONFIG_NET_9P_DEBUG
p9_debug_level = option;
+#endif
break;
case Opt_port:
v9ses->port = option;