Commit 57976602 authored by Randy Dunlap's avatar Randy Dunlap Committed by Dave Airlie

nouveau: fix acpi_lid_open undefined

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Acked-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 10b06122
...@@ -241,7 +241,8 @@ nouveau_connector_detect(struct drm_connector *connector) ...@@ -241,7 +241,8 @@ nouveau_connector_detect(struct drm_connector *connector)
if (nv_encoder && nv_connector->native_mode) { if (nv_encoder && nv_connector->native_mode) {
unsigned status = connector_status_connected; 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()) if (!nouveau_ignorelid && !acpi_lid_open())
status = connector_status_unknown; status = connector_status_unknown;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment