diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /drivers/base/power/Makefile | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/base/power/Makefile')
| -rw-r--r-- | drivers/base/power/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile index 966a5e287415..9caeaea753a3 100644 --- a/drivers/base/power/Makefile +++ b/drivers/base/power/Makefile | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | obj-y := shutdown.o | 1 | obj-y := shutdown.o |
| 2 | obj-$(CONFIG_PM) += main.o suspend.o resume.o sysfs.o | 2 | obj-$(CONFIG_PM_SLEEP) += main.o suspend.o resume.o sysfs.o |
| 3 | obj-$(CONFIG_PM_TRACE) += trace.o | 3 | obj-$(CONFIG_PM_TRACE) += trace.o |
| 4 | 4 | ||
| 5 | ifeq ($(CONFIG_DEBUG_DRIVER),y) | 5 | ifeq ($(CONFIG_DEBUG_DRIVER),y) |