about summary refs log tree commit diff
path: root/src/devices/nm-device-generic.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-01-20 16:27:43 +0100
committerMichael Biebl <biebl@debian.org>2016-01-20 16:27:43 +0100
commitcbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch)
treea97e7cf8b8903a2902c34f586661a13da2a9f2ea /src/devices/nm-device-generic.h
parent5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff)
parent494f296a3baab08522617b24b1f126d8f9a17502 (diff)
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'src/devices/nm-device-generic.h')
-rw-r--r--src/devices/nm-device-generic.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/devices/nm-device-generic.h b/src/devices/nm-device-generic.h
index c889b1dd..9303a278 100644
--- a/src/devices/nm-device-generic.h
+++ b/src/devices/nm-device-generic.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_GENERIC_H__
 #define __NETWORKMANAGER_DEVICE_GENERIC_H__
 
-#include <glib-object.h>
-
 #include "nm-device.h"
 
 G_BEGIN_DECLS
@@ -47,7 +45,7 @@ typedef struct {
 
 GType nm_device_generic_get_type (void);
 
-NMDevice *nm_device_generic_new (NMPlatformLink *platform_device);
+NMDevice *nm_device_generic_new (const NMPlatformLink *plink);
 
 G_END_DECLS