Commit 3f05c6dd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I3d4770e22d4e96b07e1e1d0f312f6fa4bb440e59
parent bbc03f7a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment