From patchwork Thu May 20 16:44:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chase Douglas X-Patchwork-Id: 53093 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 64A73B7D24 for ; Fri, 21 May 2010 02:44:36 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OF8rG-0005L0-A2; Thu, 20 May 2010 17:44:30 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OF8rE-0005Jx-3l for kernel-team@lists.ubuntu.com; Thu, 20 May 2010 17:44:28 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OF8rE-0003ib-1e for ; Thu, 20 May 2010 17:44:28 +0100 Received: from cpe-75-180-27-10.columbus.res.rr.com ([75.180.27.10] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OF8rD-0001oH-Ob for kernel-team@lists.ubuntu.com; Thu, 20 May 2010 17:44:28 +0100 From: Chase Douglas To: kernel-team@lists.ubuntu.com Subject: [PATCH] Revert "UBUNTU: SAUCE: Don't register vga16fb framebuffer if other framebuffers are present" Date: Thu, 20 May 2010 12:44:25 -0400 Message-Id: <1274373865-5711-1-git-send-email-chase.douglas@canonical.com> X-Mailer: git-send-email 1.7.0.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 --- 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;