Merge branch 'master'
[linux-2.6] / arch / i386 / power / Makefile
1 obj-$(CONFIG_PM)                += cpu.o
2 obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o