diff options
author | Richard Braun <rbraun@sceen.net> | 2017-09-21 01:26:28 +0200 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2017-09-21 01:26:28 +0200 |
commit | 4077ffe75fe9f2149cfac5b7046e73f21dc80312 (patch) | |
tree | 76be7f7076d908a395d2c15b4bf7cf4e0225004d /kern/log.c | |
parent | 9b1d0f9488c905decaac5269886b137bcd23f416 (diff) | |
parent | 1ff3666dc29c0eacf911c57d3e6b6a62bdc9cb78 (diff) |
Merge branch 'xbuild'
Diffstat (limited to 'kern/log.c')
-rw-r--r-- | kern/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -334,7 +334,7 @@ log_run(void *arg) } } -#ifdef X15_ENABLE_SHELL +#ifdef CONFIG_SHELL static void log_dump(unsigned int level) @@ -412,7 +412,7 @@ INIT_OP_DEFINE(log_setup_shell, INIT_OP_DEP(log_setup, true), INIT_OP_DEP(shell_setup, true)); -#endif /* X15_ENABLE_SHELL */ +#endif /* CONFIG_SHELL */ static int __init log_setup(void) |