summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Makefile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-02 01:40:09 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-15 00:15:16 +0100
commitec2cd81ccfc055155ef4ca673f207168f516d287 (patch)
tree5a034f64e18db76e57af7a9147fa9ad7e4d05838 /drivers/acpi/Makefile
parentbdda27fb98463244f056852f800bbce7db67dc4a (diff)
downloadop-kernel-dev-ec2cd81ccfc055155ef4ca673f207168f516d287.zip
op-kernel-dev-ec2cd81ccfc055155ef4ca673f207168f516d287.tar.gz
ACPI / PM: Move routines for adding/removing device wakeup notifiers
ACPI routines for adding and removing device wakeup notifiers are currently defined in a PCI-specific file, but they will be necessary for non-PCI devices too, so move them to a separate file under drivers/acpi and rename them to indicate their ACPI origins. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/Makefile')
-rw-r--r--drivers/acpi/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 82422fe..a2711fa 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
OpenPOWER on IntegriCloud