diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 17:52:48 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 17:52:48 -0400 |
| commit | 8989e1cc35736b03948748343fb5ba42eb3bbfb8 (patch) | |
| tree | 44feb210db2812c90761095c5e7411531d27ba83 /drivers/acpi/Makefile | |
| parent | 7e1c1a82f505e79a85a822a377bd3369e676ac2d (diff) | |
| parent | 46ba51ea8f8639da32c55744b35479fdfb4e7232 (diff) | |
Merge branch 'acpi-config'
* acpi-config:
ACPI / processor: Introduce ARCH_MIGHT_HAVE_ACPI_PDC
ACPI: Don't use acpi_lapic in ACPI core code
ACPI: add config for BIOS table scan
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index ea55e0179f81..505d4d79fe3e 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
| @@ -36,6 +36,7 @@ acpi-y += scan.o | |||
| 36 | acpi-y += resource.o | 36 | acpi-y += resource.o |
| 37 | acpi-y += acpi_processor.o | 37 | acpi-y += acpi_processor.o |
| 38 | acpi-y += processor_core.o | 38 | acpi-y += processor_core.o |
| 39 | acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC) += processor_pdc.o | ||
| 39 | acpi-y += ec.o | 40 | acpi-y += ec.o |
| 40 | acpi-$(CONFIG_ACPI_DOCK) += dock.o | 41 | acpi-$(CONFIG_ACPI_DOCK) += dock.o |
| 41 | acpi-y += pci_root.o pci_link.o pci_irq.o | 42 | acpi-y += pci_root.o pci_link.o pci_irq.o |