resolve merge

package/busybox/Config.in.manual

@@ -18,6 +18,7 @@ default ADK_PACKAGE_BUSYBOX_MINIMAL if ADK_TARGET_WITHOUT_MMU
 
 config ADK_PACKAGE_BUSYBOX_DEFAULT
 	bool "activate standard set of applets"
+	select BUSYBOX_CMP
 	select BUSYBOX_SYNC
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 	select BUSYBOX_TRUE
@@ -91,6 +92,7 @@ config ADK_PACKAGE_BUSYBOX_DEFAULT
 config ADK_PACKAGE_BUSYBOX_MINIMAL
 	bool "activate minimal set of applets"
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
+	select BUSYBOX_CMP
 	select BUSYBOX_TRUE
 	select BUSYBOX_AWK
 	select BUSYBOX_SED
@@ -143,6 +145,7 @@ config ADK_PACKAGE_BUSYBOX_ALL
 	bool "activate all applets"
 	select BUSYBOX_DESKTOP
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
+	select BUSYBOX_CMP
 	select BUSYBOX_SYNC
 	select BUSYBOX_TRUE
 	select BUSYBOX_FDISK

package/mksh/Makefile

@@ -17,6 +17,7 @@ PKG_DFLT_MKSH:=		y if !ADK_TOOLCHAIN_ONLY && !ADK_TARGET_WITHOUT_MMU
 PKG_SUBPKGS:=		MKSH MKSH_TEST
 PKGSD_MKSH_TEST:=	install testsuite
 PKGSC_MKSH_TEST:=	base/tests
+PKGSS_MKSH_TEST:=	ed
 
 DISTFILES:=		$(PKG_NAME)-R$(PKG_VERSION).tgz
 WRKDIST=		$(WRKDIR)/$(PKG_NAME)