Merge branch 'pci/jiang-pci_slot-kconfig' into next

* pci/jiang-pci_slot-kconfig:
  ACPI / PCI: Make pci_slot built-in only, not a module

diff --cc drivers/acpi/internal.h
index 0f24148,7374cfc..e09ce03
--- 1/drivers/acpi/internal.h
--- 2/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -67,8 -67,12 +67,13 @@@ struct acpi_ec 
  
  extern struct acpi_ec *first_ec;
  
+ #ifdef        CONFIG_ACPI_PCI_SLOT
+ void acpi_pci_slot_init(void);
+ #else
+ static inline void acpi_pci_slot_init(void) { }
+ #endif
  int acpi_pci_root_init(void);
 +void acpi_pci_root_hp_init(void);
  int acpi_ec_init(void);
  int acpi_ec_ecdt_probe(void);
  int acpi_boot_ec_enable(void);

diff --cc drivers/acpi/scan.c
Simple merge