From patchwork Wed Oct 13 19:57:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 251271 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 o9DJwHt0029358 for ; Wed, 13 Oct 2010 19:58:52 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F05359F660 for ; Wed, 13 Oct 2010 12:58:16 -0700 (PDT) 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 CC84B9E907 for ; Wed, 13 Oct 2010 12:58:02 -0700 (PDT) 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 o9DJvjxF031841 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 13 Oct 2010 19:57:46 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by rcsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o9DHYTee004241; Wed, 13 Oct 2010 19:57:44 GMT Received: from abhmt012.oracle.com by acsmt355.oracle.com with ESMTP id 688589301286999861; Wed, 13 Oct 2010 12:57:41 -0700 Received: from chimera.site (/173.50.240.230) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 13 Oct 2010 12:57:40 -0700 Date: Wed, 13 Oct 2010 12:57:38 -0700 From: Randy Dunlap To: Stephen Rothwell , dri-devel@lists.freedesktop.org, akpm Subject: [PATCH -next] gpu/drm: fix build errors and kconfig dependency warnings Message-Id: <20101013125738.24a0bd95.randy.dunlap@oracle.com> In-Reply-To: <20101013154522.7b087a20.sfr@canb.auug.org.au> References: <20101013154522.7b087a20.sfr@canb.auug.org.au> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Cc: linux-next@vger.kernel.org, LKML , David@freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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]); Wed, 13 Oct 2010 19:58:53 +0000 (UTC) --- linux-next-20101013.orig/drivers/gpu/drm/nouveau/Kconfig +++ linux-next-20101013/drivers/gpu/drm/nouveau/Kconfig @@ -1,16 +1,17 @@ config DRM_NOUVEAU tristate "Nouveau (nVidia) cards" - depends on DRM && PCI + depends on DRM && PCI && HWMON + depends on FB select FW_LOADER select DRM_KMS_HELPER select DRM_TTM select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB 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. --- linux-next-20101013.orig/drivers/gpu/drm/Kconfig +++ linux-next-20101013/drivers/gpu/drm/Kconfig @@ -22,7 +22,7 @@ menuconfig DRM config DRM_KMS_HELPER tristate depends on DRM - select FB + depends on FB select FRAMEBUFFER_CONSOLE if !EMBEDDED help FB and CRTC helpers for KMS drivers.