Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6

[linux-2.6-omap-h63xx.git] / include / acpi / processor.h

diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 82a9b7d430ecc0e6e54c0e7c2aa8ba94b4fac433..badf0277b1be7314a59f9b6a8c7836e25b14c314 100644 (file)
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -223,9 +223,6 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr)
 /* in processor_throttling.c */
 int acpi_processor_get_throttling_info(struct acpi_processor *pr);
 int acpi_processor_set_throttling(struct acpi_processor *pr, int state);
-ssize_t acpi_processor_write_throttling(struct file *file,
-                                       const char __user * buffer,
-                                       size_t count, loff_t * data);
 extern struct file_operations acpi_processor_throttling_fops;
 
 /* in processor_idle.c */
@@ -237,9 +234,6 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
 
 /* in processor_thermal.c */
 int acpi_processor_get_limit_info(struct acpi_processor *pr);
-ssize_t acpi_processor_write_limit(struct file *file,
-                                  const char __user * buffer,
-                                  size_t count, loff_t * data);
 extern struct file_operations acpi_processor_limit_fops;
 
 #ifdef CONFIG_CPU_FREQ