Merge busybox into merge

Fix merge conflict in coreutils/timeout.c.

1 files changed, 1 insertions, 1 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 60df3476f..9b37b174d 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -13,6 +13,7 @@ INSERT
 lib-y += appletlib.o
 lib-y += ask_confirmation.o
 lib-y += bb_bswap_64.o
+lib-y += bb_do_delay.o
 lib-y += bb_pwd.o
 lib-y += bb_qsort.o
 #lib-y += bb_strtod.o
@@ -92,7 +93,6 @@ lib-y += xreadlink.o
 lib-y += xrealloc_vector.o
 
 lib-$(CONFIG_PLATFORM_POSIX) += bb_askpass.o
-lib-$(CONFIG_PLATFORM_POSIX) += bb_do_delay.o
 lib-$(CONFIG_PLATFORM_POSIX) += change_identity.o
 lib-$(CONFIG_PLATFORM_POSIX) += device_open.o
 lib-$(CONFIG_PLATFORM_POSIX) += find_root_device.o