diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-26 00:36:44 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-26 00:36:44 +0100 |
| commit | cc38e519132f62d52db0a04d2eaed0d7c52fb165 (patch) | |
| tree | 35baaba355d6fbc1d43e9ca12278156f3eeab910 /drivers/acpi/Makefile | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | b8bd759acd05281abf88cddef30c57313c109697 (diff) | |
Merge branch 'acpi-scan' into acpi-cleanup
The following commits depend on the 'acpi-scan' material.
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 2a4502becd1..4ee2e753306 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -37,7 +37,7 @@ acpi-y += resource.o acpi-y += processor_core.o acpi-y += ec.o acpi-$(CONFIG_ACPI_DOCK) += dock.o -acpi-y += pci_root.o pci_link.o pci_irq.o pci_bind.o +acpi-y += pci_root.o pci_link.o pci_irq.o acpi-y += acpi_platform.o acpi-y += power.o acpi-y += event.o |