Merge branch from toybox/master

Conflicts:
	both modified:      lib/portability.c
	both modified:      lib/portability.h
	both modified:      scripts/genconfig.sh
	both modified:      scripts/runtest.sh
	both added:         tests/sed.test
	both modified:      toys/other/acpi.c
	both modified:      toys/other/ifconfig.c
	deleted by them:    toys/other/unshare.c
	both added:         toys/pending/hwclock.c
	both modified:      toys/pending/ip.c
	deleted by them:    toys/pending/sed.c
	both modified:      toys/posix/chgrp.c
	both modified:      toys/posix/cp.c
	both modified:      toys/posix/id.c
	both modified:      toys/posix/ls.c

Change-Id: Ib36c5267ec054a5683ca37da2383d83b3cb1b5b4
Signed-off-by: Hyejin Kim <hyejin0906.kim@samsung.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/help.c b/lib/help.c
index 9965539..b5d8f6b 100644
--- a/lib/help.c
+++ b/lib/help.c
@@ -10,7 +10,7 @@ void show_help(void) {;}
 #undef NEWTOY
 #undef OLDTOY
 #define NEWTOY(name,opt,flags) help_##name "\0"
-#define OLDTOY(name,oldname,opts,flags) "\xff" #oldname "\0"
+#define OLDTOY(name,oldname,flags) "\xff" #oldname "\0"
 static char *help_data =
 #include "generated/newtoys.h"
 ;