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

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;