diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-01-18 11:17:16 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-01-18 11:17:16 +0100 |
| commit | 11ee2a3808aebbec73096551a716dea03d417fcb (patch) | |
| tree | 4675f5d2f11de09319213cb36aee4184a6df7fd0 /drivers/gpu | |
| parent | ACPI: EC: Look for ECDT EC after calling acpi_load_tables() (diff) | |
| parent | drivers: thermal: int340x_thermal: Make PCI dependency explicit (diff) | |
| download | linux-11ee2a3808aebbec73096551a716dea03d417fcb.tar.xz linux-11ee2a3808aebbec73096551a716dea03d417fcb.zip | |
Merge branch 'acpi-pci'
* acpi-pci:
drivers: thermal: int340x_thermal: Make PCI dependency explicit
x86/intel/lpss: Make PCI dependency explicit
platform/x86: apple-gmux: Make PCI dependency explicit
platform/x86: intel_pmc: Make PCI dependency explicit
platform/x86: intel_ips: make PCI dependency explicit
vga-switcheroo: make PCI dependency explicit
ata: pata_acpi: Make PCI dependency explicit
ACPI / LPSS: Make PCI dependency explicit
Diffstat (limited to 'drivers/gpu')
| -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 b677e5d524e6..d5f1d8e1c6f8 100644 --- a/drivers/gpu/vga/Kconfig +++ b/drivers/gpu/vga/Kconfig @@ -21,6 +21,7 @@ config VGA_SWITCHEROO bool "Laptop Hybrid Graphics - GPU switching support" depends on X86 depends on ACPI + depends on PCI select VGA_ARB help Many laptops released in 2008/9/10 have two GPUs with a multiplexer |