diff options
| author | Bartlomiej Zolnierkiewicz <[email protected]> | 2019-06-26 11:56:53 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <[email protected]> | 2019-06-26 11:56:53 +0200 |
| commit | c2d3c8a424307af188d844005bc8dc7dc4a96bdf (patch) | |
| tree | 439181422c6546d275345f05ad333e34c51e2281 | |
| parent | 76c47323c15106f8cbd67c722e85f2eb583b86c1 (diff) | |
| parent | 6116b892bd4fd0ddc5f30566a556218bb2e1a9b6 (diff) | |
Merge tag 'topic/remove-fbcon-notifiers-2019-06-26' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
topic/remove-fbcon-notifiers:
- Export fbcon_update_vcs to fix sh_mobile_lcdcfb.c compilation.
- Rely on fbcon being builtin when vgaswitcheroo is builtin.
| -rw-r--r-- | drivers/gpu/vga/Kconfig | 1 |
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 |