Merge branch 'processor-procfs-2.6.32' into release

[pandora-kernel.git] / drivers / acpi / processor_thermal.c

diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index 3e3181c..140c5c5 100644 (file)
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -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