diff options
| author | Christoph Hellwig <hch@lst.de> | 2004-07-03 22:00:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-03 22:00:37 -0700 |
| commit | b293a6b1447ca1dd8539a121fa1b04770c72c5e6 (patch) | |
| tree | d9fc84faa470ef63dcda79d422f0f0a903fbd3a8 /kernel | |
| parent | 3af7025847d447d4b9ab6169c34e33782b48c5ba (diff) | |
[PATCH] ppc32: compilation failure on ppc32
This fixes compilation on ppc32.
The power/smp.o file should be linked only if both SMP and SWSUSPEND
are configured in. It used to do it even without SWSUSPEND.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index 079dd4d678ce..2509213f50f2 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -1,6 +1,8 @@ + +swsusp-smp-$(CONFIG_SMP) += smp.o + obj-y := main.o process.o console.o pm.o -obj-$(CONFIG_SMP) += smp.o -obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o +obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o $(swsusp-smp-y) obj-$(CONFIG_PM_DISK) += disk.o pmdisk.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o |