[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100523170040.3c4aa87c.randy.dunlap@oracle.com>
Date: Sun, 23 May 2010 17:00:40 -0700
From: Randy Dunlap <randy.dunlap@...cle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
Ben Skeggs <bskeggs@...hat.com>,
dri-devel@...ts.freedesktop.org
Cc: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
David Airlie <airlied@...ux.ie>
Subject: [PATCH -next] nouveau: fix acpi_lid_open undefined
From: Randy Dunlap <randy.dunlap@...cle.com>
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 <randy.dunlap@...cle.com>
Cc: David Airlie <airlied@...ux.ie>
Cc: dri-devel@...ts.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists