diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 19:44:01 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 19:44:01 -0500 |
| commit | ad06bff31fbf0aba4e5faae936e12292a7972b05 (patch) | |
| tree | 7a3f2a4da501c10e5821f6e1930a78572ce66d7c /drivers/acpi/scan.c | |
| parent | 20f24208f631141bafe57ce5bcc8f2e7f3c41aae (diff) | |
| parent | ab1a2e038ff2336502e95ec6492c0364a9fc70d0 (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/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index bc2f33790e83..b643aed8b74b 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -1687,6 +1687,7 @@ int __init acpi_scan_init(void) | |||
| 1687 | 1687 | ||
| 1688 | acpi_power_init(); | 1688 | acpi_power_init(); |
| 1689 | acpi_pci_root_init(); | 1689 | acpi_pci_root_init(); |
| 1690 | acpi_pci_slot_init(); | ||
| 1690 | 1691 | ||
| 1691 | /* | 1692 | /* |
| 1692 | * Enumerate devices in the ACPI namespace. | 1693 | * Enumerate devices in the ACPI namespace. |