From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757852AbZLNTwN (ORCPT ); Mon, 14 Dec 2009 14:52:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757326AbZLNTwL (ORCPT ); Mon, 14 Dec 2009 14:52:11 -0500 Received: from acsinet11.oracle.com ([141.146.126.233]:30801 "EHLO acsinet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754376AbZLNTwJ (ORCPT ); Mon, 14 Dec 2009 14:52:09 -0500 Date: Mon, 14 Dec 2009 11:51:40 -0800 From: Randy Dunlap To: Stephen Rothwell , David Airlie , Ben Skeggs Cc: linux-next@vger.kernel.org, LKML Subject: [PATCH -next] nouveau: fix ch7006 build Message-Id: <20091214115140.db309483.randy.dunlap@oracle.com> In-Reply-To: <20091214165927.c08c4784.sfr@canb.auug.org.au> References: <20091214165927.c08c4784.sfr@canb.auug.org.au> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.12.0; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Source-IP: acsmt354.oracle.com [141.146.40.154] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090202.4B269749.0051:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap The ch7006 driver could be built even when nouveau was not enabled, but the build fails in that case, so make it depend on DRM_NOUVEUA. Also make the I2c encoder/helper chips menu depend on I2C (no build error, just visual inspection). ERROR: "drm_helper_probe_single_connector_modes" [drivers/gpu/drm/i2c/ch7006.ko] undefined! Signed-off-by: Randy Dunlap Cc: David Airlie Cc: Ben Skeggs --- drivers/gpu/drm/nouveau/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- linux-next-20091214.orig/drivers/gpu/drm/nouveau/Kconfig +++ linux-next-20091214/drivers/gpu/drm/nouveau/Kconfig @@ -30,11 +30,12 @@ config DRM_NOUVEAU_DEBUG via debugfs. menu "I2C encoder or helper chips" - depends on DRM + depends on DRM && I2C config DRM_I2C_CH7006 tristate "Chrontel ch7006 TV encoder" - default m if DRM_NOUVEAU + depends on DRM_NOUVEAU + default m help Support for Chrontel ch7006 and similar TV encoders, found on some nVidia video cards.