Merge commit 'v2.6.37' into next

[mv-sheeva.git] / include / acpi / processor.h

diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index a68ca8a11a53a6cc06ff32190c16d4f84279ac29..1b62102fbb67e8b34e28dacf4bb323d424380c25 100644 (file)
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -338,7 +338,6 @@ extern struct cpuidle_driver acpi_idle_driver;
 
 /* in processor_thermal.c */
 int acpi_processor_get_limit_info(struct acpi_processor *pr);
-extern const struct file_operations acpi_processor_limit_fops;
 extern struct thermal_cooling_device_ops processor_cooling_ops;
 #ifdef CONFIG_CPU_FREQ
 void acpi_thermal_cpufreq_init(void);