Index: conf/Makefile
===================================================================
--- conf/Makefile	(revision 35869)
+++ conf/Makefile	(revision 35870)
@@ -9,7 +9,7 @@
 LIB_HIDLIB=-lrnd-hid -lrnd-3rd
 
 LIB_PCBRND_OBJS=\
-	../../src_plugins/diag/diag_conf.o \
+	../../src_plugins/diag/rnd_diag.o \
 	../../src/conf_core.o \
 	../../src/conf_internal.o
 
Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 35869)
+++ conf/conftest.c	(revision 35870)
@@ -62,7 +62,7 @@
 	if (strncmp(arg, "native", 6) == 0) {
 		arg+=7;
 		while(isspace(*arg)) arg++;
-		conf_dump(stdout, "", 1, arg);
+		rnd_diag_conf_dump(stdout, "", 1, arg);
 	}
 	else if (strncmp(arg, "lihata", 6) == 0) {
 		rnd_conf_role_t role;