From: Zwane Mwaikambo <zwane@linuxpower.ca>

There was a 2.4 merge from Alan Cox, but a few #ifdef's got shuffled around
in the process, resulting in a broken build for !CONFIG_PM