Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6] / arch / x86 / power / Makefile
1 obj-$(CONFIG_PM)                += cpu.o
2 obj-$(CONFIG_HIBERNATION)       += swsusp.o suspend.o