Fix up more code for the Wheatley governor

Conflicts:
	drivers/cpufreq/cpufreq_ondemand.c
	include/linux/cpufreq.h
Fix up more code for the Wheatley governor

Conflicts:
	drivers/cpufreq/cpufreq_ondemand.c
	include/linux/cpufreq.h