summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/internal.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-02-15 17:44:01 -0700
committerBjorn Helgaas <bhelgaas@google.com>2013-02-15 17:44:01 -0700
commitad06bff31fbf0aba4e5faae936e12292a7972b05 (patch)
tree7a3f2a4da501c10e5821f6e1930a78572ce66d7c /drivers/acpi/internal.h
parent20f24208f631141bafe57ce5bcc8f2e7f3c41aae (diff)
parentab1a2e038ff2336502e95ec6492c0364a9fc70d0 (diff)
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
Diffstat (limited to 'drivers/acpi/internal.h')
-rw-r--r--drivers/acpi/internal.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 0f24148a2b2..e09ce0373d4 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -67,6 +67,11 @@ 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);