diff options
| author |  Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2012-11-27 13:42:42 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2012-11-27 13:42:42 +0100 |
| commit | 45c36462aef0cccadb7755ea4edc78d13334a2be (patch) | |
| tree | d707b2863494452585941d3818347005f34c636e /drivers/acpi/Makefile | |
| parent | mmc: sdhci-acpi: add SDHCI ACPI driver (diff) | |
| parent | ACPI / PM: Allow attach/detach routines to change device power states (diff) | |
| download | linux-45c36462aef0cccadb7755ea4edc78d13334a2be.tar.gz linux-45c36462aef0cccadb7755ea4edc78d13334a2be.tar.bz2 linux-45c36462aef0cccadb7755ea4edc78d13334a2be.zip | |
Merge branch 'acpi-dev-pm' into acpi-enumeration
Subsequent commits in this branch will depend on 'acpi-dev-pm'
material.
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 7198b6d6b763..2a4502becd13 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -21,9 +21,10 @@ obj-y += acpi.o \ acpi-y += osl.o utils.o reboot.o acpi-y += nvs.o -# sleep related files +# Power management related files acpi-y += wakeup.o acpi-y += sleep.o +acpi-$(CONFIG_PM) += device_pm.o acpi-$(CONFIG_ACPI_SLEEP) += proc.o |