summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/pcc-cpufreq.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-18 01:22:29 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-18 01:22:29 +0100
commitbd2a0f6754f18f801ed1e490bf678fc3be013eca (patch)
tree93c1e594bff4a5cbd553d2df428cefa8e28f42e3 /drivers/cpufreq/pcc-cpufreq.c
parentfc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff)
parent7e7e8fe69820c6fa31395dbbd8e348e3c69cd2a9 (diff)
downloadop-kernel-dev-bd2a0f6754f18f801ed1e490bf678fc3be013eca.zip
op-kernel-dev-bd2a0f6754f18f801ed1e490bf678fc3be013eca.tar.gz
Merge back cpufreq material for 3.19-rc1.
Diffstat (limited to 'drivers/cpufreq/pcc-cpufreq.c')
-rw-r--r--drivers/cpufreq/pcc-cpufreq.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index 4d2c8e8..2a0d589 100644
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -603,6 +603,13 @@ static void __exit pcc_cpufreq_exit(void)
free_percpu(pcc_cpu_info);
}
+static const struct acpi_device_id processor_device_ids[] = {
+ {ACPI_PROCESSOR_OBJECT_HID, },
+ {ACPI_PROCESSOR_DEVICE_HID, },
+ {},
+};
+MODULE_DEVICE_TABLE(acpi, processor_device_ids);
+
MODULE_AUTHOR("Matthew Garrett, Naga Chumbalkar");
MODULE_VERSION(PCC_VERSION);
MODULE_DESCRIPTION("Processor Clocking Control interface driver");
OpenPOWER on IntegriCloud