From patchwork Mon Nov  8 15:51:10 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
X-Patchwork-Id: 308832
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA8GxSUP032566
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Mon, 8 Nov 2010 16:59:48 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 183BF9ED69
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Mon,  8 Nov 2010 08:59:28 -0800 (PST)
X-Original-To: dri-devel@lists.freedesktop.org
Delivered-To: dri-devel@lists.freedesktop.org
Received: from rcsinet10.oracle.com (rcsinet10.oracle.com [148.87.113.121])
	by gabe.freedesktop.org (Postfix) with ESMTP id 9530F9E806
	for <dri-devel@lists.freedesktop.org>;
	Mon,  8 Nov 2010 07:52:02 -0800 (PST)
Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117])
	by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id
	oA8FpjYV001957
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Mon, 8 Nov 2010 15:51:47 GMT
Received: from acsmt355.oracle.com (acsmt355.oracle.com [141.146.40.155])
	by rcsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id
	oA8DcOW5030255; Mon, 8 Nov 2010 15:51:45 GMT
Received: from abhmt013.oracle.com by acsmt355.oracle.com
	with ESMTP id 757491061289231474; Mon, 08 Nov 2010 07:51:14 -0800
Received: from phenom (/209.6.55.207) by default (Oracle Beehive Gateway
	v4.0) with ESMTP ; Mon, 08 Nov 2010 07:51:14 -0800
Received: by phenom (Postfix, from userid 1000)
	id D773875; Mon,  8 Nov 2010 10:51:10 -0500 (EST)
Date: Mon, 8 Nov 2010 10:51:10 -0500
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: airlied@linux.ie, bskeggs@redhat.com, airlied@redhat.com,
	dri-devel@lists.freedesktop.org
Subject: [bruce.edge@gmail.com: PATCH: ERROR: "video_output_register"
	[drivers/acpi/video.ko] und]
Message-ID: <20101108155110.GB8637@dumpdata.com>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
X-Mailman-Approved-At: Mon, 08 Nov 2010 08:59:19 -0800
Cc: len.brown@intel.com, Bruce Edge <bruce.edge@gmail.com>
X-BeenThere: dri-devel@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Direct Rendering Infrastructure - Development
	<dri-devel.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Sender: 
 dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Mon, 08 Nov 2010 16:59:48 +0000 (UTC)


--- old/drivers/gpu/drm/nouveau/Kconfig
+++ new/drivers/gpu/drm/nouveau/Kconfig
@@ -11,6 +11,7 @@
        select FRAMEBUFFER_CONSOLE if !EMBEDDED
        select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
        select ACPI_VIDEO if ACPI
+       select VIDEO_OUTPUT_CONTROL if ACPI
        help
          Choose this option for open-source nVidia support.