summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2013-09-23 10:12:14 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2013-09-23 14:29:11 +1000
commitfccc81251f77c48a4bd18ab1bcf3b308cca8e097 (patch)
tree1425f3f973897e3fc281573a95186721e8796c2c
parentb4fe610088b40b0092222db7ba0f7770e79f74fc (diff)
nouveau: fix build eror when VGA_SWITCHEROO is not enabled
Fix nouveau build error on x86, when ACPI is enabled but VGA_SWITCHEROO is not enabled, by providing a stub function. drivers/built-in.o: In function `nouveau_pmops_runtime_suspend': nouveau_drm.c:(.text+0x3aac89): undefined reference to `nouveau_switcheroo_optimus_dsm' Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: David Airlie <airlied@linux.ie> Cc: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_acpi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index 7fe98195d6a2..145bdac13a37 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -373,6 +373,7 @@ void nouveau_unregister_dsm_handler(void)
#else
void nouveau_register_dsm_handler(void) {}
void nouveau_unregister_dsm_handler(void) {}
+void nouveau_switcheroo_optimus_dsm(void) {}
#endif
/* retrieve the ROM in 4k blocks */