video/aperture: Only kick vgacon when the pdev is decoding vga

[linux-2.6-microblaze.git] / drivers / video / aperture.c

diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c
index c56553d..b85163e 100644 (file)
--- a/drivers/video/aperture.c
+++ b/drivers/video/aperture.c
@@ -342,13 +342,15 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na
                        return ret;
        }
 
-       /*
-        * WARNING: Apparently we must kick fbdev drivers before vgacon,
-        * otherwise the vga fbdev driver falls over.
-        */
-       ret = vga_remove_vgacon(pdev);
-       if (ret)
-               return ret;
+       if (primary) {
+               /*
+                * WARNING: Apparently we must kick fbdev drivers before vgacon,
+                * otherwise the vga fbdev driver falls over.
+                */
+               ret = vga_remove_vgacon(pdev);
+               if (ret)
+                       return ret;
+       }
 
        return 0;