diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-16 02:18:36 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 02:18:36 -0500 |
| commit | 8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4 (patch) | |
| tree | 76cd9d4492d7fe4e2a90dbbc43127ca80ad93288 /include/acpi/processor.h | |
| parent | 7458bbd044f0e799ad27c3fc71e1115ac30a9c25 (diff) | |
| parent | d81c45e1c9369855901420f79114852eba2ea16a (diff) | |
| download | op-kernel-dev-8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4.zip op-kernel-dev-8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4.tar.gz | |
Merge branch 'ost' into release
Conflicts:
include/acpi/processor.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 8b668ea..29245c6 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -294,7 +294,7 @@ static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx #ifdef CONFIG_CPU_FREQ void acpi_processor_ppc_init(void); void acpi_processor_ppc_exit(void); -int acpi_processor_ppc_has_changed(struct acpi_processor *pr); +int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag); extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit); #else static inline void acpi_processor_ppc_init(void) @@ -305,7 +305,8 @@ static inline void acpi_processor_ppc_exit(void) { return; } -static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) +static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr, + int event_flag) { static unsigned int printout = 1; if (printout) { |
