diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 16:21:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 16:21:47 -0700 |
| commit | cf2d9500a5a0df61713b56f2f40aa0b81a6f9f63 (patch) | |
| tree | 945afa7596fcdc4d960812dee1812c187d282bff /include/acpi | |
| parent | 3f3b55bf7833d81d00c793d722e2af58d3b12963 (diff) | |
| parent | d714aaf649460cbfd5e82e75520baa856b4fa0a0 (diff) | |
Merge branch 'usb-linus' into usb-next
This is to pick up the fixes in that branch, and let Alan fix the merge
error in drivers/usb/host/ehci-timer.c better than I just did (as I know
I messed it up...)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/processor.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 555d0337ad9..b327b5a9296 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -235,6 +235,9 @@ extern void acpi_processor_unregister_performance(struct if a _PPC object exists, rmmod is disallowed then */ int acpi_processor_notify_smm(struct module *calling_module); +/* parsing the _P* objects. */ +extern int acpi_processor_get_performance_info(struct acpi_processor *pr); + /* for communication between multiple parts of the processor kernel module */ DECLARE_PER_CPU(struct acpi_processor *, processors); extern struct acpi_processor_errata errata; |