]> git.ipfire.org Git - people/ms/linux.git/commit
drm/nouveau: make vga_switcheroo code depend on VGA_SWITCHEROO
authorJeff Mahoney <jeffm@suse.com>
Tue, 21 Jan 2014 22:34:52 +0000 (14:34 -0800)
committerJiri Slaby <jslaby@suse.cz>
Thu, 3 Apr 2014 08:32:10 +0000 (10:32 +0200)
commitfa13abce6b4afb291b5ff0c6a0de5f39e4b540a9
tree2e3f89f6b50cb5a4a1bf5e173567f7385df2d488
parent8276a9aefbceca886665110d1ad9460391bec9b6
drm/nouveau: make vga_switcheroo code depend on VGA_SWITCHEROO

commit d0ce7b8567ae76b8a6c0eb8361d121deb98c1b3f upstream.

Commit 8116188fdef594 ("nouveau/acpi: hook up to the MXM method for mux
switching.") broke the build on non-x86 architectures due to the new
dependency on MXM and MXM being an x86 platform driver.

It built previously since the vga switcheroo registration routines were
zereod out on !X86.  The code was built in but unused.

This patch makes all of the DSM code depend on CONFIG_VGA_SWITCHEROO,
allowing it to build on non-x86 and shrinking the module size as well.

[rdunlap@infradead.org: fix build eror when VGA_SWITCHEROO is not enabled]
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/gpu/drm/nouveau/nouveau_acpi.c