diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2021-06-08 17:16:11 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2021-06-08 17:16:11 -0700 |
| commit | 54ada34b4dfdb864ac602e13ff87581abe517ce9 (patch) | |
| tree | 8c92ca68c13e86b71f9cbf05a1a432c3ba4ea67b /include/uapi/linux/virtio_ids.h | |
| parent | 605a5e41db7d8c930fb80115686991c4c1d08ee4 (diff) | |
| parent | 4a2c1dcfaf59be4b357400d893c3f5daff6cab6c (diff) | |
| download | cachepc-linux-54ada34b4dfdb864ac602e13ff87581abe517ce9.tar.gz cachepc-linux-54ada34b4dfdb864ac602e13ff87581abe517ce9.zip | |
Merge branch 'rafael/acpica/cfmws' into for-5.14/cxl
Pick up the definition of the CXL Fixed Memory Window Structure from
Rafael's ACPICA development branch.
Diffstat (limited to 'include/uapi/linux/virtio_ids.h')
| -rw-r--r-- | include/uapi/linux/virtio_ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h index f0c35ce8628c..4fe842c3a3a9 100644 --- a/include/uapi/linux/virtio_ids.h +++ b/include/uapi/linux/virtio_ids.h @@ -54,7 +54,7 @@ #define VIRTIO_ID_SOUND 25 /* virtio sound */ #define VIRTIO_ID_FS 26 /* virtio filesystem */ #define VIRTIO_ID_PMEM 27 /* virtio pmem */ -#define VIRTIO_ID_BT 28 /* virtio bluetooth */ #define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */ +#define VIRTIO_ID_BT 40 /* virtio bluetooth */ #endif /* _LINUX_VIRTIO_IDS_H */ |