From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755654Ab0EXABF (ORCPT ); Sun, 23 May 2010 20:01:05 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:36935 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754190Ab0EXABC (ORCPT ); Sun, 23 May 2010 20:01:02 -0400 Date: Sun, 23 May 2010 17:00:40 -0700 From: Randy Dunlap To: Stephen Rothwell , Ben Skeggs , dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, LKML , David Airlie Subject: [PATCH -next] nouveau: fix acpi_lid_open undefined Message-Id: <20100523170040.3c4aa87c.randy.dunlap@oracle.com> In-Reply-To: <20100522170459.4c89723d.sfr@canb.auug.org.au> References: <20100522170459.4c89723d.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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Auth-Type: Internal IP X-Source-IP: rcsinet13.oracle.com [148.87.113.125] X-CT-RefId: str=0001.0A090201.4BF9C1B0.0160:SCFMA4539811,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap When CONFIG_ACPI_BUTTON=m (and probably when ACPI_BUTTON is not enabled) and NOUVEAU is built-in (not as a loadable module): nouveau_connector.c:(.text+0xe17ce): undefined reference to `acpi_lid_open' Signed-off-by: Randy Dunlap Cc: David Airlie Cc: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- linux-next-20100522.orig/drivers/gpu/drm/nouveau/nouveau_connector.c +++ linux-next-20100522/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -241,7 +241,8 @@ nouveau_connector_detect(struct drm_conn if (nv_encoder && nv_connector->native_mode) { unsigned status = connector_status_connected; -#ifdef CONFIG_ACPI +#if defined(CONFIG_ACPI_BUTTON) || \ + (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(MODULE)) if (!nouveau_ignorelid && !acpi_lid_open()) status = connector_status_unknown; #endif