Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 4 insertions, 9 deletions

diff --git a/src/devices/nm-device-generic.h b/src/devices/nm-device-generic.h
index 9a5ff091..42442180 100644
--- a/src/devices/nm-device-generic.h
+++ b/src/devices/nm-device-generic.h
@@ -32,17 +32,12 @@
 
 #define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 
-typedef struct {
-	NMDevice parent;
-} NMDeviceGeneric;
-
-typedef struct {
-	NMDeviceClass parent;
-
-} NMDeviceGenericClass;
+typedef struct _NMDeviceGeneric NMDeviceGeneric;
+typedef struct _NMDeviceGenericClass NMDeviceGenericClass;
 
 GType nm_device_generic_get_type (void);
 
-NMDevice *nm_device_generic_new (const NMPlatformLink *plink);
+NMDevice *nm_device_generic_new (const NMPlatformLink *plink,
+                                 gboolean nm_plugin_missing);
 
 #endif /* __NETWORKMANAGER_DEVICE_GENERIC_H__ */