From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Ben Skeggs <bskeggs@redhat.com>,
dri-devel@lists.freedesktop.org
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
David Airlie <airlied@linux.ie>
Subject: [PATCH -next] nouveau: fix acpi_lid_open undefined
Date: Sun, 23 May 2010 17:00:40 -0700 [thread overview]
Message-ID: <20100523170040.3c4aa87c.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20100522170459.4c89723d.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.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@oracle.com>
Cc: David Airlie <airlied@linux.ie>
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
next prev parent reply other threads:[~2010-05-24 0:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-22 7:04 linux-next: Tree for May 22 Stephen Rothwell
2010-05-23 22:15 ` [PATCH -next] x86/platform: classmate-laptop depends on RFKILL Randy Dunlap
2010-05-23 23:33 ` [PATCH -next] platform/x86: msi-laptop depends on SERIO_I8042 Randy Dunlap
2010-05-28 17:24 ` Matthew Garrett
2010-05-24 0:00 ` Randy Dunlap [this message]
2010-05-24 0:09 ` [PATCH -next] nouveau: fix acpi_lid_open undefined Ben Skeggs
2010-05-24 12:56 ` Matthew Garrett
2010-05-24 13:53 ` Randy Dunlap
2010-05-24 13:59 ` Matthew Garrett
2010-05-24 14:17 ` Randy Dunlap
2010-05-24 22:47 ` Dave Airlie
2010-05-25 3:27 ` Nigel Cunningham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100523170040.3c4aa87c.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=airlied@linux.ie \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).