Merge branch 'processor-procfs-2.6.32' into release

2009-09-19 02:10:40 -04:00
parent 7ef0143e2f b188e4ce3b
commit cbeee13570
5 changed files with 38 additions and 9 deletions
@@ -440,7 +440,7 @@ struct thermal_cooling_device_ops processor_cooling_ops = {
 };

 /* /proc interface */
-
+#ifdef CONFIG_ACPI_PROCFS
 static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)
 {
 	struct acpi_processor *pr = (struct acpi_processor *)seq->private;
@@ -519,3 +519,4 @@ const struct file_operations acpi_processor_limit_fops = {
 	.llseek = seq_lseek,
 	.release = single_release,
 };
+#endif