From 35ff9cc3dd71685909ad438af3f9fac60f93b3f1 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 21 Mar 2011 21:59:35 +0000
Subject: [PATCH] Prep for 6.0 release

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3408 42af7a65-404d-4744-a932-0658087f49c3
---
 Makefile                | 6 ------
 examples/nsh/nsh_main.c | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/Makefile b/Makefile
index be7b9f6be..5c4e8dc09 100644
--- a/Makefile
+++ b/Makefile
@@ -52,8 +52,6 @@ SUBDIRS = nuttapp nshlib netutils examples vsn
 BUILTIN_APPS_BUILT = nuttapp/.built_always
 BUILTIN_APPS_DIR = nuttapp
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
-
 # CONFIGURED_APPS is the list of all configured built-in directories/built action
 # It is created by the configured appconfig file (a copy of which appears in this
 # directoy as .config)
@@ -86,10 +84,6 @@ $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_AVAILABLE,$(BUILTIN))))
 $(foreach APP, $(AVAILABLE_APPS), $(eval $(call BUILTIN_ADD_APP,$(APP))))
 $(foreach BUILT, $(AVAILABLE_APPS), $(eval $(call BUILTIN_ADD_BUILT,$(BUILT))))
 
-# end of application list
-
-endif
-
 # The final build target
 
 BIN		= libapps$(LIBEXT)
diff --git a/examples/nsh/nsh_main.c b/examples/nsh/nsh_main.c
index 6f63308b4..1bd09e8a3 100644
--- a/examples/nsh/nsh_main.c
+++ b/examples/nsh/nsh_main.c
@@ -51,11 +51,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifndef CONFIG_BUILTIN_APPS
-#  warning "This example requires CONFIG_BUILTIN_APPS..."
-#  warning "  You must have an appconfig file in your config directory to use this example"
-#endif
-
 /****************************************************************************
  * Private Types
  ****************************************************************************/