Commit 11ee2a38 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents b1c03308 6f9b5e70

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ config X86_INTEL_QUARK 


config X86_INTEL_LPSS

	bool "Intel Low Power Subsystem Support"

	depends on X86 && ACPI

	depends on X86 && ACPI && PCI

	select COMMON_CLK

	select PINCTRL

	select IOSF_MBI

drivers/acpi/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ acpi-y += ec.o 
acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

acpi-$(CONFIG_PCI)		+= pci_root.o pci_link.o pci_irq.o

obj-$(CONFIG_ACPI_MCFG)		+= pci_mcfg.o

acpi-y				+= acpi_lpss.o acpi_apd.o

acpi-$(CONFIG_PCI)		+= acpi_lpss.o

acpi-y				+= acpi_apd.o

acpi-y				+= acpi_platform.o

acpi-y				+= acpi_pnp.o

acpi-$(CONFIG_ARM_AMBA)	+= acpi_amba.o

drivers/acpi/internal.h

+4 −0
Original line number Diff line number Diff line
@@ -81,7 +81,11 @@ void acpi_debugfs_init(void); 
#else

static inline void acpi_debugfs_init(void) { return; }

#endif

#ifdef CONFIG_PCI

void acpi_lpss_init(void);

#else

static inline void acpi_lpss_init(void) {}

#endif



void acpi_apd_init(void);

drivers/ata/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ comment "Generic fallback / legacy drivers" 


config PATA_ACPI

	tristate "ACPI firmware driver for PATA"

	depends on ATA_ACPI && ATA_BMDMA

	depends on ATA_ACPI && ATA_BMDMA && PCI

	help

	  This option enables an ACPI method driver which drives

	  motherboard PATA controller interfaces through the ACPI

drivers/gpu/vga/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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