[PATCH -next] nouveau: fix acpi_lid_open undefined

[Ben Skeggs]

On Sun, 2010-05-23 at 17:00 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap at 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 at oracle.com>
Acked-by: Ben Skeggs <bskeggs at redhat.com>

> Cc: David Airlie <airlied at linux.ie>
> Cc: dri-devel at 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