Merge branches 'pm-wakeup' and 'pm-domains'

[karo-tx-linux.git] / drivers / video / hyperv_fb.c

diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c
index b7b3dd0ab675dc39fa1f7dc278d124def3ecf192..e23392ec5af359ed1f4c8eb0c228325ff6d4c396 100644 (file)
--- a/drivers/video/hyperv_fb.c
+++ b/drivers/video/hyperv_fb.c
@@ -679,6 +679,8 @@ static int hvfb_getmem(struct fb_info *info)
        if (gen2vm) {
                info->apertures->ranges[0].base = screen_info.lfb_base;
                info->apertures->ranges[0].size = screen_info.lfb_size;
+               remove_conflicting_framebuffers(info->apertures,
+                                               KBUILD_MODNAME, false);
        } else {
                info->apertures->ranges[0].base = pci_resource_start(pdev, 0);
                info->apertures->ranges[0].size = pci_resource_len(pdev, 0);