diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:51:16 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:51:16 -0400 |
| commit | e2fae0abf6a9c7a2da1a481b7adb4e24f7778992 (patch) | |
| tree | dbf0007632ca651baa9c7193b0ead3547c656c33 /include/acpi | |
| parent | fff251f6b26bb8f4de15fa5906cf2611623b3661 (diff) | |
| parent | c07c9a78a95cab0a9bf0b253d0c52e7798af38c5 (diff) | |
Merge branch 'constify' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/processor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 0574add2a1e3..b09c4fde9725 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -322,7 +322,7 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) | |||
| 322 | int acpi_processor_tstate_has_changed(struct acpi_processor *pr); | 322 | int acpi_processor_tstate_has_changed(struct acpi_processor *pr); |
| 323 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); | 323 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); |
| 324 | extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); | 324 | extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); |
| 325 | extern struct file_operations acpi_processor_throttling_fops; | 325 | extern const struct file_operations acpi_processor_throttling_fops; |
| 326 | extern void acpi_processor_throttling_init(void); | 326 | extern void acpi_processor_throttling_init(void); |
| 327 | /* in processor_idle.c */ | 327 | /* in processor_idle.c */ |
| 328 | int acpi_processor_power_init(struct acpi_processor *pr, | 328 | int acpi_processor_power_init(struct acpi_processor *pr, |
| @@ -336,7 +336,7 @@ extern struct cpuidle_driver acpi_idle_driver; | |||
| 336 | 336 | ||
| 337 | /* in processor_thermal.c */ | 337 | /* in processor_thermal.c */ |
| 338 | int acpi_processor_get_limit_info(struct acpi_processor *pr); | 338 | int acpi_processor_get_limit_info(struct acpi_processor *pr); |
| 339 | extern struct file_operations acpi_processor_limit_fops; | 339 | extern const struct file_operations acpi_processor_limit_fops; |
| 340 | extern struct thermal_cooling_device_ops processor_cooling_ops; | 340 | extern struct thermal_cooling_device_ops processor_cooling_ops; |
| 341 | #ifdef CONFIG_CPU_FREQ | 341 | #ifdef CONFIG_CPU_FREQ |
| 342 | void acpi_thermal_cpufreq_init(void); | 342 | void acpi_thermal_cpufreq_init(void); |