From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 16 Feb 2013 00:44:01 +0000 (-0700)
Subject: Merge branch 'pci/jiang-pci_slot-kconfig' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ad06bff31fbf0aba4e5faae936e12292a7972b05;p=linux.git

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
---

ad06bff31fbf0aba4e5faae936e12292a7972b05
diff --cc drivers/acpi/internal.h
index 0f24148a2b2a3,7374cfc5917a2..e09ce0373d41f
--- a/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);