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 branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
[sfrench/cifs-2.6.git]
/
drivers
/
base
/
power
/
Makefile
diff --git
a/drivers/base/power/Makefile
b/drivers/base/power/Makefile
index 966a5e2874150eae972089e728f4b37b17cec9b8..44504e6618fbb0006e369cf39ff75d55578057bb 100644
(file)
--- a/
drivers/base/power/Makefile
+++ b/
drivers/base/power/Makefile
@@
-1,5
+1,6
@@
obj-y := shutdown.o
-obj-$(CONFIG_PM) += main.o suspend.o resume.o sysfs.o
+obj-$(CONFIG_PM) += sysfs.o
+obj-$(CONFIG_PM_SLEEP) += main.o
obj-$(CONFIG_PM_TRACE) += trace.o
ifeq ($(CONFIG_DEBUG_DRIVER),y)