[PATCH] Revert "UBUNTU: SAUCE: Don't register vga16fb framebuffer if other framebuffers are present"

Chase Douglas chase.douglas at canonical.com
Thu May 20 16:44:25 UTC 2010


This reverts commit a3ce60db76c222c030b5837112e779b8630d0746.

This was a one-time fix for Lucid because we will not be using vga16fb
in Maverick. Thus, we should drop it.

Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
 drivers/video/vga16fb.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 3affd2a..7774da4 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1354,16 +1354,6 @@ static int __devinit vga16fb_probe(struct platform_device *dev)
 
 	vga16fb_update_fix(info);
 
-	/*
-	 * Ubuntu: Don't register vga16fb if another fb exists. Bad interactions
-	 * can occur.
-	 */
-	if (num_registered_fb > 0) {
-		printk(KERN_NOTICE "vga16fb: not registering due to another "
-		       "framebuffer present\n");
-		goto err_check_var;
-	}
-
 	if (register_framebuffer(info) < 0) {
 		printk(KERN_ERR "vga16fb: unable to register framebuffer\n");
 		ret = -EINVAL;
-- 
1.7.0.4





More information about the kernel-team mailing list