mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 04:12:04 -04:00
Merge branch 'android11-5.4' into 'android11-5.4-lts'
Sync up with android11-5.4 for the following commits:4271ad6e8aBACKPORT: mac80211_hwsim: add frame transmission support over virtio This allows communication with external entities.8e3c3ebe1dANDROID: ABI: add symbols of sprd_ion.ko and snd-soc-sprd-codec-sc2730.ko to unisoc Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I6f756dd6d72ea7d585902bddb350202fc49c7a3c
This commit is contained in:
commit
f4e194e665
5 changed files with 493 additions and 234 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue