ANDROID: fix up 5.10.132 merge with the virtio_mmio.c driver
The merge of 5.10.132 into the android12-5.10-lts branch caused duplicate functions to be merged into the same file. Fix this up by removing the out-of-tree versions and accepting the versions that came in as part of 5.10.132 Fixes: 0c724b69 ("Merge 5.10.132 into android12-5.10-lts") Signed-off-by:Greg Kroah-Hartman <gregkh@google.com> Change-Id: I3d4770e22d4e96b07e1e1d0f312f6fa4bb440e59
Loading
Please sign in to comment