* [PATCH] nouveau: fix undefined reference to acpi_lid_open
@ 2010-02-17 9:42 Daniel Mack
2010-02-17 22:04 ` Marcin Slusarz
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Mack @ 2010-02-17 9:42 UTC (permalink / raw)
To: linux-kernel
Cc: Daniel Mack, David Airlie, Ben Skeggs, Francisco Jerez,
Maarten Maathuis, Xavier Chantry, Marcin Slusarz, dri-devel
Fix the following compile time error:
drivers/built-in.o: In function `nouveau_connector_detect':
/home/daniel/src/linux/jup/linux-2.6/drivers/gpu/drm/nouveau/nouveau_connector.c:243: undefined reference to `acpi_lid_open'
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Francisco Jerez <currojerez@riseup.net>
Cc: Maarten Maathuis <madman2003@gmail.com>
Cc: Xavier Chantry <shiningxc@gmail.com>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: dri-devel@lists.sourceforge.net
---
drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index d2f6335..c74d45d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -239,7 +239,7 @@ nouveau_connector_detect(struct drm_connector *connector)
if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
if (nv_encoder && nv_connector->native_mode) {
-#ifdef CONFIG_ACPI
+#ifdef CONFIG_ACPI_BUTTON
if (!nouveau_ignorelid && !acpi_lid_open())
return connector_status_disconnected;
#endif
--
1.6.5.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] nouveau: fix undefined reference to acpi_lid_open
@ 2010-02-17 22:04 ` Marcin Slusarz
0 siblings, 0 replies; 3+ messages in thread
From: Marcin Slusarz @ 2010-02-17 22:04 UTC (permalink / raw)
To: Daniel Mack
Cc: linux-kernel, David Airlie, Ben Skeggs, Francisco Jerez,
Maarten Maathuis, Xavier Chantry, dri-devel, nouveau
On Wed, Feb 17, 2010 at 10:42:43AM +0100, Daniel Mack wrote:
> Fix the following compile time error:
>
> drivers/built-in.o: In function `nouveau_connector_detect':
> /home/daniel/src/linux/jup/linux-2.6/drivers/gpu/drm/nouveau/nouveau_connector.c:243: undefined reference to `acpi_lid_open'
>
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Ben Skeggs <bskeggs@redhat.com>
> Cc: Francisco Jerez <currojerez@riseup.net>
> Cc: Maarten Maathuis <madman2003@gmail.com>
> Cc: Xavier Chantry <shiningxc@gmail.com>
> Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
> Cc: dri-devel@lists.sourceforge.net
> ---
> drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
> index d2f6335..c74d45d 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> @@ -239,7 +239,7 @@ nouveau_connector_detect(struct drm_connector *connector)
> if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
> nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
> if (nv_encoder && nv_connector->native_mode) {
> -#ifdef CONFIG_ACPI
> +#ifdef CONFIG_ACPI_BUTTON
> if (!nouveau_ignorelid && !acpi_lid_open())
> return connector_status_disconnected;
> #endif
> --
You are fixing CONFIG_ACPI_BUTTON=m vs CONFIG_DRM_NOUVEAU=y compilation,
but breaking runtime behaviour of CONFIG_ACPI_BUTTON=m + CONFIG_DRM_NOUVEAU=m.
I think this code should be compiled when:
#if defined(CONFIG_ACPI_BUTTON) || (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(CONFIG_DRM_NOUVEAU_MODULE))
Marcin
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] nouveau: fix undefined reference to acpi_lid_open
@ 2010-02-17 22:04 ` Marcin Slusarz
0 siblings, 0 replies; 3+ messages in thread
From: Marcin Slusarz @ 2010-02-17 22:04 UTC (permalink / raw)
To: Daniel Mack
Cc: dri-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, David Airlie,
nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Ben Skeggs, Xavier Chantry
On Wed, Feb 17, 2010 at 10:42:43AM +0100, Daniel Mack wrote:
> Fix the following compile time error:
>
> drivers/built-in.o: In function `nouveau_connector_detect':
> /home/daniel/src/linux/jup/linux-2.6/drivers/gpu/drm/nouveau/nouveau_connector.c:243: undefined reference to `acpi_lid_open'
>
> Signed-off-by: Daniel Mack <daniel-rDUAYElUppE@public.gmane.org>
> Cc: David Airlie <airlied-cv59FeDIM0c@public.gmane.org>
> Cc: Ben Skeggs <bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Cc: Francisco Jerez <currojerez-sGOZH3hwPm2sTnJN9+BGXg@public.gmane.org>
> Cc: Maarten Maathuis <madman2003-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Xavier Chantry <shiningxc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: dri-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> ---
> drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
> index d2f6335..c74d45d 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> @@ -239,7 +239,7 @@ nouveau_connector_detect(struct drm_connector *connector)
> if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
> nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
> if (nv_encoder && nv_connector->native_mode) {
> -#ifdef CONFIG_ACPI
> +#ifdef CONFIG_ACPI_BUTTON
> if (!nouveau_ignorelid && !acpi_lid_open())
> return connector_status_disconnected;
> #endif
> --
You are fixing CONFIG_ACPI_BUTTON=m vs CONFIG_DRM_NOUVEAU=y compilation,
but breaking runtime behaviour of CONFIG_ACPI_BUTTON=m + CONFIG_DRM_NOUVEAU=m.
I think this code should be compiled when:
#if defined(CONFIG_ACPI_BUTTON) || (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(CONFIG_DRM_NOUVEAU_MODULE))
Marcin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-02-17 22:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-17 9:42 [PATCH] nouveau: fix undefined reference to acpi_lid_open Daniel Mack
2010-02-17 22:04 ` Marcin Slusarz
2010-02-17 22:04 ` Marcin Slusarz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.