Merge branch 'pm-cpufreq'

[karo-tx-linux.git] / drivers / acpi / processor_perflib.c

diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 53cfe8ba9799f690773f4b3adc6a34648bd1fff5..bb01dea39fdccfd50e0b61713b5ba983bb62285b 100644 (file)
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -83,7 +83,7 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb,
        if (ignore_ppc)
                return 0;
 
-       if (event != CPUFREQ_INCOMPATIBLE)
+       if (event != CPUFREQ_ADJUST)
                return 0;
 
        mutex_lock(&performance_mutex);
@@ -780,9 +780,7 @@ acpi_processor_register_performance(struct acpi_processor_performance
 
 EXPORT_SYMBOL(acpi_processor_register_performance);
 
-void
-acpi_processor_unregister_performance(struct acpi_processor_performance
-                                     *performance, unsigned int cpu)
+void acpi_processor_unregister_performance(unsigned int cpu)
 {
        struct acpi_processor *pr;