From patchwork Thu Oct 28 15:34:54 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Phil Turmel <philip@turmel.org>
X-Patchwork-Id: 289522
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 o9T6cJSP018174
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Fri, 29 Oct 2010 06:38:40 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id AF89F9E997
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Thu, 28 Oct 2010 23:38:18 -0700 (PDT)
X-Original-To: dri-devel@lists.freedesktop.org
Delivered-To: dri-devel@lists.freedesktop.org
Received: from atl.turmel.org (atl.turmel.org [74.117.157.138])
	by gabe.freedesktop.org (Postfix) with ESMTP id 79B579E839
	for <dri-devel@lists.freedesktop.org>;
	Thu, 28 Oct 2010 08:35:14 -0700 (PDT)
Received: from [173.160.90.133] (helo=[192.168.19.67])
	by atl.turmel.org with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <philip@turmel.org>)
	id 1PBUVE-0007qR-3j; Thu, 28 Oct 2010 11:34:56 -0400
Message-ID: <4CC9981E.80202@turmel.org>
Date: Thu, 28 Oct 2010 11:34:54 -0400
From: Phil Turmel <philip@turmel.org>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.2.11) Gecko/20101023 Lightning/1.0b2 Thunderbird/3.1.5
MIME-Version: 1.0
To: Ingo Molnar <mingo@elte.hu>
Subject: Re: -tip: origin tree build failure (Was: [git pull] drm tree for
	merge window)
References: <alpine.DEB.2.00.1010270214140.28394@skynet.skynet.ie>
	<alpine.DEB.2.00.1010270228090.28394@skynet.skynet.ie>
	<20101028131204.GA29323@elte.hu>
In-Reply-To: <20101028131204.GA29323@elte.hu>
X-Enigmail-Version: 1.1.2
X-Mailman-Approved-At: Thu, 28 Oct 2010 23:38:08 -0700
Cc: Randy Dunlap <randy.dunlap@oracle.com>, linux-kernel@vger.kernel.org,
	DRI mailing list <dri-devel@lists.freedesktop.org>,
	Lee Revell <rlrevell@joe-job.com>, Chun-Yi <jlee@novell.com>,
	Andrew Morton <akpm@linux-foundation.org>, torvalds@linux-foundation.org
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]);
	Fri, 29 Oct 2010 06:38:41 +0000 (UTC)


diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 72730e9..c33ecb6 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -11,6 +11,9 @@ config DRM_NOUVEAU
 	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
 	select ACPI_VIDEO if ACPI
+	select VIDEO_OUTPUT_CONTROL if ACPI
+	select BACKLIGHT_CLASS_DEVICE if ACPI
+	select INPUT if ACPI
 	help
 	  Choose this option for open-source nVidia support.