diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-13 23:28:58 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-13 23:28:58 -0500 |
| commit | 7b0a65f9923ffe7885a5473648baaa3a1a701726 (patch) | |
| tree | b9be4a0504b4e637b86bdc92d88268ff57ea1bc5 /kernel/power/Makefile | |
| parent | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (diff) | |
| parent | ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel/power/Makefile')
| -rw-r--r-- | kernel/power/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index c71eb4579c07..04be7d0d96a7 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile | |||
| @@ -3,7 +3,8 @@ ifeq ($(CONFIG_PM_DEBUG),y) | |||
| 3 | EXTRA_CFLAGS += -DDEBUG | 3 | EXTRA_CFLAGS += -DDEBUG |
| 4 | endif | 4 | endif |
| 5 | 5 | ||
| 6 | obj-y := main.o process.o console.o pm.o | 6 | obj-y := main.o process.o console.o |
| 7 | obj-$(CONFIG_PM_LEGACY) += pm.o | ||
| 7 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o disk.o snapshot.o | 8 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o disk.o snapshot.o |
| 8 | 9 | ||
| 9 | obj-$(CONFIG_SUSPEND_SMP) += smp.o | 10 | obj-$(CONFIG_SUSPEND_SMP) += smp.o |