diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2020-05-23 00:01:13 +0200 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2020-05-23 00:01:13 +0200 |
| commit | 1f422417945d08731e2915e0addb976f11b3a85a (patch) | |
| tree | 7ef06daa2a34c3b527e3eb7a064bc4af0c9100c0 /include/uapi/linux/virtio_ids.h | |
| parent | c177e2975430cec296aa52a0d413e447417d6cf9 (diff) | |
| parent | 6d15120b282e49811a47f2f6d6b749d178be7e99 (diff) | |
Merge branch 'timers/drivers/timer-ti' into timers/drivers/next
Diffstat (limited to 'include/uapi/linux/virtio_ids.h')
| -rw-r--r-- | include/uapi/linux/virtio_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h index 585e07b27333..ecc27a17401a 100644 --- a/include/uapi/linux/virtio_ids.h +++ b/include/uapi/linux/virtio_ids.h @@ -46,5 +46,6 @@ #define VIRTIO_ID_IOMMU 23 /* virtio IOMMU */ #define VIRTIO_ID_FS 26 /* virtio filesystem */ #define VIRTIO_ID_PMEM 27 /* virtio pmem */ +#define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */ #endif /* _LINUX_VIRTIO_IDS_H */ |