diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 15:45:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 15:45:35 -0800 |
| commit | 5980bb3ee6e733d66eea04c221a140dea15d52de (patch) | |
| tree | 5365854f6fc7db6cc2d6a5cfc605942058c7a76a /drivers/base/power/Makefile | |
| parent | 68ae6b5cc1e8b88754a64140b88e467e02abfea2 (diff) | |
| parent | d690b2cd222afc75320b9b8e9da7df02e9e630ca (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Provide generic subsystem-level callbacks
PM / Runtime: Document power.runtime_auto and related functions
Diffstat (limited to 'drivers/base/power/Makefile')
| -rw-r--r-- | drivers/base/power/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile index 3ce3519e8f3..89de75325ce 100644 --- a/drivers/base/power/Makefile +++ b/drivers/base/power/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_PM) += sysfs.o obj-$(CONFIG_PM_SLEEP) += main.o obj-$(CONFIG_PM_RUNTIME) += runtime.o +obj-$(CONFIG_PM_OPS) += generic_ops.o obj-$(CONFIG_PM_TRACE_RTC) += trace.o ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG |