summaryrefslogtreecommitdiff
path: root/nuttx/sched
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-21 21:59:35 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-21 21:59:35 +0000
commitaa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2 (patch)
tree2ee3d56220eb419976035ac38aa73dc8f5e249b8 /nuttx/sched
parent60051cba0cf424e01ef2eda09816ee8945867b6d (diff)
downloadpx4-nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.tar.gz
px4-nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.tar.bz2
px4-nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.zip
Prep for 6.0 releasenuttx-6.0
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3408 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched')
-rw-r--r--nuttx/sched/os_bringup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/sched/os_bringup.c b/nuttx/sched/os_bringup.c
index 64b4e9388..dd413277a 100644
--- a/nuttx/sched/os_bringup.c
+++ b/nuttx/sched/os_bringup.c
@@ -54,7 +54,7 @@
#ifdef CONFIG_SCHED_WORKQUEUE
# include "work_internal.h"
#endif
-#ifdef CONFIG_BUILTIN_APPS
+#ifdef CONFIG_BUILTIN_APP_START
# include "apps/apps.h"
#endif
@@ -120,7 +120,7 @@
int os_bringup(void)
{
-#if defined(CONFIG_BUILTIN_APPS) && defined(CONFIG_BUILTIN_APP_START)
+#ifdef CONFIG_BUILTIN_APP_START
static const char *argv[3] = {NULL, "init", NULL};
#endif
int init_taskid;
@@ -155,8 +155,8 @@ int os_bringup(void)
*/
svdbg("Starting init thread\n");
-
-#if defined(CONFIG_BUILTIN_APPS) && defined(CONFIG_BUILTIN_APP_START)
+
+#ifdef CONFIG_BUILTIN_APP_START
/* Start the built-in application, passing an "init" argument, so that
* application can distinguish different run-levels
*/