Merge drm/drm-next into drm-misc-next

[linux-block.git] / drivers / video / fbdev / efifb.c

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index b3d5f884c5445b68759b8f18bc7ef8047e10ec30..16c1aaae9afa45680c6bd79ef8c87c2c4987c5ee 100644 (file)
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -358,17 +358,6 @@ static int efifb_probe(struct platform_device *dev)
        char *option = NULL;
        efi_memory_desc_t md;
 
-       /*
-        * Generic drivers must not be registered if a framebuffer exists.
-        * If a native driver was probed, the display hardware was already
-        * taken and attempting to use the system framebuffer is dangerous.
-        */
-       if (num_registered_fb > 0) {
-               dev_err(&dev->dev,
-                       "efifb: a framebuffer is already registered\n");
-               return -EINVAL;
-       }
-
        if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI || pci_dev_disabled)
                return -ENODEV;