diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 13:18:27 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 13:18:27 -0500 |
| commit | 8dbb8d54fe0bb551d515393fca495508d36af2a1 (patch) | |
| tree | fd35c997c01a7e61cf6e547e6561a34887a42c25 /include/acpi | |
| parent | 93658cb8597ab76655220be43d3d7f74c66e9e4e (diff) | |
| parent | 34411a69a4925dd6de8e1069956f59d758da3ce9 (diff) | |
Merge branch 'acpi-processor'
* acpi-processor:
ACPI / processor: Do not request ACPI cpufreq module directly
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/processor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 7816e45f5d5a..6eb1d3cb5104 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -225,7 +225,6 @@ struct acpi_processor_errata { | |||
| 225 | } piix4; | 225 | } piix4; |
| 226 | }; | 226 | }; |
| 227 | 227 | ||
| 228 | extern void acpi_processor_load_module(struct acpi_processor *pr); | ||
| 229 | extern int acpi_processor_preregister_performance(struct | 228 | extern int acpi_processor_preregister_performance(struct |
| 230 | acpi_processor_performance | 229 | acpi_processor_performance |
| 231 | __percpu *performance); | 230 | __percpu *performance); |