git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
[sfrench/cifs-2.6.git]
/
drivers
/
base
/
power
/
Makefile
diff --git
a/drivers/base/power/Makefile
b/drivers/base/power/Makefile
index 89de75325ceabfa1336cce34dd481d3ebf0dc476..cbccf9a3cee49a67b0952e633065f54ff7357747 100644
(file)
--- a/
drivers/base/power/Makefile
+++ b/
drivers/base/power/Makefile
@@
-1,5
+1,5
@@
obj-$(CONFIG_PM) += sysfs.o
-obj-$(CONFIG_PM_SLEEP) += main.o
+obj-$(CONFIG_PM_SLEEP) += main.o
wakeup.o
obj-$(CONFIG_PM_RUNTIME) += runtime.o
obj-$(CONFIG_PM_OPS) += generic_ops.o
obj-$(CONFIG_PM_TRACE_RTC) += trace.o