Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
[powerpc.git] / arch / i386 / power / Makefile
1 obj-$(CONFIG_PM)                += cpu.o
2 obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o