[CPUFREQ] Fix up merge conflicts with recent ACPI changes.