summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2004-01-28 07:42:21 -0500
committerLen Brown <len.brown@intel.com>2004-01-28 07:42:21 -0500
commit5f6fa7a7c42dcc8af01401aa7b5f59d303aa4462 (patch)
tree599dbbe04a343078644af5f9f5275806fefb6602 /include
parent3b6999115a0b464233be56065b4a33436f41a64a (diff)
parentcf9b129e5db461835f8b593a0c39182abba0bccc (diff)
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.1
into intel.com:/home/lenb/src/linux-acpi-test-2.6.2
Diffstat (limited to 'include')
-rw-r--r--include/acpi/processor.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index ade6751584d6..f693a665b00a 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -135,7 +135,9 @@ struct acpi_processor {
extern int acpi_processor_register_performance (
struct acpi_processor_performance * performance,
- struct acpi_processor ** pr,
+ unsigned int cpu);
+extern void acpi_processor_unregister_performance (
+ struct acpi_processor_performance * performance,
unsigned int cpu);
#endif