From 354116817a07fe13eae9ddfb21c369d67552c72a Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 5 Apr 2011 01:46:55 +0000
Subject: Progress toward kernel build

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3465 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/nshlib/nsh_parse.c    | 4 ++--
 apps/nshlib/nsh_proccmds.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'apps')

diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c
index e93c624fa..fe7423f66 100644
--- a/apps/nshlib/nsh_parse.c
+++ b/apps/nshlib/nsh_parse.c
@@ -153,7 +153,7 @@ static const struct cmdmap_s g_cmdmap[] =
 #endif
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
-# ifndef CONFIG_NSH_DISABLE_LS
+# ifndef CONFIG_NSH_DISABLE_DD
   { "dd",       cmd_dd,       3, 6, "if=<infile> of=<outfile> [bs=<sectsize>] [count=<sectors>] [skip=<sectors>]" },
 # endif
 #endif
@@ -194,7 +194,7 @@ static const struct cmdmap_s g_cmdmap[] =
 #endif
 
 #ifndef CONFIG_DISABLE_SIGNALS
-# ifndef CONFIG_NSH_DISABLE_SLEEP
+# ifndef CONFIG_NSH_DISABLE_KILL
   { "kill",     cmd_kill,     3, 3, "-<signal> <pid>" },
 # endif
 #endif
diff --git a/apps/nshlib/nsh_proccmds.c b/apps/nshlib/nsh_proccmds.c
index 0ee48a71d..7abd50ec1 100644
--- a/apps/nshlib/nsh_proccmds.c
+++ b/apps/nshlib/nsh_proccmds.c
@@ -69,6 +69,7 @@ typedef int (*exec_t)(void);
  * Private Data
  ****************************************************************************/
 
+#ifndef CONFIG_NSH_DISABLE_PS
 static const char *g_statenames[] =
 {
   "INVALID ",
@@ -85,6 +86,7 @@ static const char *g_statenames[] =
   "MQNFULL "
 #endif
 };
+#endif
 
 /****************************************************************************
  * Public Data
-- 
cgit v1.2.3