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-adsl.c b/libnm/nm-device-adsl.c
index 7608ff39..3285745d 100644
--- a/libnm/nm-device-adsl.c
+++ b/libnm/nm-device-adsl.c
@@ -25,7 +25,6 @@
 
 #include <string.h>
 
-#include "nm-device-private.h"
 #include "nm-object-private.h"
 
 #include "nm-setting-adsl.h"
@@ -84,12 +83,11 @@ get_setting_type (NMDevice *device)
 	return NM_TYPE_SETTING_ADSL;
 }
 
-/******************************************************************/
+/*****************************************************************************/
 
 static void
 nm_device_adsl_init (NMDeviceAdsl *device)
 {
-	_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_ADSL);
 }
 
 static void
@@ -135,8 +133,6 @@ nm_device_adsl_class_init (NMDeviceAdslClass *adsl_class)
 
 	g_type_class_add_private (object_class, sizeof (NMDeviceAdslPrivate));
 
-	_nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_DEVICE_ADSL);
-
 	/* virtual methods */
 	object_class->get_property = get_property;