Merge with git://charm.itp.tuwien.ac.at/mattems/klibc/.git#maks
diff --git a/usr/kinit/Kbuild b/usr/kinit/Kbuild
index 37b35cf..59db29b 100644
--- a/usr/kinit/Kbuild
+++ b/usr/kinit/Kbuild
@@ -4,8 +4,7 @@
static-y := kinit
kinit-y := kinit.o do_mounts.o ramdisk_load.o initrd.o
-kinit-y += name_to_dev.o devname.o
-kinit-y += getarg.o getintfile.o open.o readfile.o xpio.o
+kinit-y += getintfile.o open.o readfile.o xpio.o
kinit-y += do_mounts_md.o do_mounts_mtd.o nfsroot.o
kinit-y += ipconfig/
diff --git a/usr/kinit/resume/resumelib.c b/usr/kinit/resume/resumelib.c
index bd328bd..ce5c2b2 100644
--- a/usr/kinit/resume/resumelib.c
+++ b/usr/kinit/resume/resumelib.c
@@ -74,7 +74,7 @@
failure:
if (powerfd >= 0)
close(powerfd);
- fprintf(stderr, "Resume failed, doing normal boot...\n");
+ fprintf(stderr, "kinit: No resume image, doing normal boot...\n");
return -1;
fail_r:
