Fix quilt merge error in acpi-cpufreq.c