Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[sfrench/cifs-2.6.git] / arch / i386 / power / Makefile
1 obj-$(CONFIG_PM)                += cpu.o
2 obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o suspend.o