diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /src/devices/nm-device-vlan.h | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'src/devices/nm-device-vlan.h')
| -rw-r--r-- | src/devices/nm-device-vlan.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/devices/nm-device-vlan.h b/src/devices/nm-device-vlan.h index 20fc3453..e31e171d 100644 --- a/src/devices/nm-device-vlan.h +++ b/src/devices/nm-device-vlan.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_DEVICE_VLAN_H__ #define __NETWORKMANAGER_DEVICE_VLAN_H__ -#include <glib-object.h> - #include "nm-device.h" G_BEGIN_DECLS @@ -44,9 +42,6 @@ typedef enum { #define NM_DEVICE_VLAN_PARENT "parent" #define NM_DEVICE_VLAN_ID "vlan-id" -/* Internal non-exported properties */ -#define NM_DEVICE_VLAN_INT_PARENT_DEVICE "int-parent-device" - typedef NMDevice NMDeviceVlan; typedef NMDeviceClass NMDeviceVlanClass; |