From: Daniel Mack on
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(a)caiaq.de>
Cc: David Airlie <airlied(a)linux.ie>
Cc: Ben Skeggs <bskeggs(a)redhat.com>
Cc: Francisco Jerez <currojerez(a)riseup.net>
Cc: Maarten Maathuis <madman2003(a)gmail.com>
Cc: Xavier Chantry <shiningxc(a)gmail.com>
Cc: Marcin Slusarz <marcin.slusarz(a)gmail.com>
Cc: dri-devel(a)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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/