Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 5 insertions, 5 deletions

diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c
index f6b6af90..4d25f9a6 100644
--- a/src/devices/tests/test-lldp.c
+++ b/src/devices/tests/test-lldp.c
@@ -26,12 +26,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "nm-lldp-listener.h"
-#include "nm-sd.h"
+#include "devices/nm-lldp-listener.h"
+#include "systemd/nm-sd.h"
 
-#include "sd-lldp.h"
-
-#include "test-common.h"
+#include "platform/tests/test-common.h"
 
 #include "nm-test-utils-core.h"
 
@@ -434,6 +432,8 @@ _test_recv_fixture_teardown (TestRecvFixture *fixture, gconstpointer user_data)
 
 /*****************************************************************************/
 
+NMTstpSetupFunc const _nmtstp_setup_platform_func = nm_linux_platform_setup;
+
 void
 _nmtstp_init_tests (int *argc, char ***argv)
 {