summaryrefslogtreecommitdiff
path: root/drivers/gpu/vga
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-06-26 12:26:34 +0200
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-06-26 12:26:34 +0200
commitdaed277e4d5ace0883d30b9be245d35c46289f49 (patch)
tree878ef8e5e978dc3b5772bde96532598ec638a678 /drivers/gpu/vga
parent355a47ae7ebcf9d605aa809b259d380422e81b8d (diff)
parent6116b892bd4fd0ddc5f30566a556218bb2e1a9b6 (diff)
Merge tag 'topic/remove-fbcon-notifiers-2019-06-26' into drm-misc-next-fixes
topic/remove-fbcon-notifiers: - Export fbcon_update_vcs to fix sh_mobile_lcdcfb.c compilation. - Rely on fbcon being builtin when vgaswitcheroo is builtin. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/7dd06ccb-7f8d-943b-bbc0-f4e58e041a23@linux.intel.com
Diffstat (limited to 'drivers/gpu/vga')
-rw-r--r--drivers/gpu/vga/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 84ab482d0db6..c8c770b05ed9 100644
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -23,6 +23,7 @@ config VGA_SWITCHEROO
depends on X86
depends on ACPI
depends on PCI
+ depends on (FRAMEBUFFER_CONSOLE=n || FB=y)
select VGA_ARB
help
Many laptops released in 2008/9/10 have two GPUs with a multiplexer