diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-05-23 20:00:40 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-23 20:21:47 -0400 |
commit | 579766020d2eee2f1c51af1641ef9a7dbc6a5798 (patch) | |
tree | d2f25279b8264b6ed7ecd21fb7900ee34353ab8b | |
parent | 10b06122afcc78468bd1d009633cb71e528acdc5 (diff) |
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: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 7e663a79829f..266b0ff441af 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c | |||
@@ -241,7 +241,8 @@ nouveau_connector_detect(struct drm_connector *connector) | |||
241 | if (nv_encoder && nv_connector->native_mode) { | 241 | if (nv_encoder && nv_connector->native_mode) { |
242 | unsigned status = connector_status_connected; | 242 | unsigned status = connector_status_connected; |
243 | 243 | ||
244 | #ifdef CONFIG_ACPI | 244 | #if defined(CONFIG_ACPI_BUTTON) || \ |
245 | (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(MODULE)) | ||
245 | if (!nouveau_ignorelid && !acpi_lid_open()) | 246 | if (!nouveau_ignorelid && !acpi_lid_open()) |
246 | status = connector_status_unknown; | 247 | status = connector_status_unknown; |
247 | #endif | 248 | #endif |