Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 1 insertions, 5 deletions

diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index d442dc03..7fc843f6 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -28,7 +28,6 @@
 #include "nm-setting-cdma.h"
 
 #include "nm-device-modem.h"
-#include "nm-device-private.h"
 #include "nm-object-private.h"
 #include "nm-enum-types.h"
 
@@ -153,12 +152,11 @@ get_setting_type (NMDevice *device)
 		return G_TYPE_INVALID;
 }
 
-/*******************************************************************/
+/*****************************************************************************/
 
 static void
 nm_device_modem_init (NMDeviceModem *device)
 {
-	_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_MODEM);
 }
 
 static void
@@ -208,8 +206,6 @@ nm_device_modem_class_init (NMDeviceModemClass *modem_class)
 
 	g_type_class_add_private (modem_class, sizeof (NMDeviceModemPrivate));
 
-	_nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_DEVICE_MODEM);
-
 	/* virtual methods */
 	object_class->get_property = get_property;