diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 08:10:40 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 08:10:40 +0200 |
| commit | cbeee13570adfb0af494a07074958e4888c2351c (patch) | |
| tree | 998d9ff501c4abe19ebe5c262aa5b7052fa80b72 /drivers/acpi/processor_thermal.c | |
| parent | Merge branch 'preempt' into release (diff) | |
| parent | ACPI: fix CONFIG_ACPI_PROCFS=n build warning (diff) | |
| download | linux-cbeee13570adfb0af494a07074958e4888c2351c.tar.xz linux-cbeee13570adfb0af494a07074958e4888c2351c.zip | |
Merge branch 'processor-procfs-2.6.32' into release
Diffstat (limited to 'drivers/acpi/processor_thermal.c')
| -rw-r--r-- | drivers/acpi/processor_thermal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index 3e3181c0efc3..140c5c5b423c 100644 --- 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 |