]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
nouveau: fix build eror when VGA_SWITCHEROO is not enabled
authorRandy Dunlap <rdunlap@infradead.org>
Tue, 5 Nov 2013 05:54:52 +0000 (16:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 5 Nov 2013 05:54:52 +0000 (16:54 +1100)
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: Ben Skeggs <bskeggs@redhat.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/gpu/drm/nouveau/nouveau_acpi.c

index 7fe98195d6a221e4de3cb46898bc6baf5a0a9dfe..145bdac13a37b181bbc4266beb622eaa8e10c686 100644 (file)
@@ -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 */