diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 02:10:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 02:10:40 -0400 |
| commit | cbeee13570adfb0af494a07074958e4888c2351c (patch) | |
| tree | 998d9ff501c4abe19ebe5c262aa5b7052fa80b72 /drivers/acpi/processor_thermal.c | |
| parent | 7ef0143e2f898f9bf675c81bdf0e045c8dd53c57 (diff) | |
| parent | b188e4ce3b7965ecc8d45191042cc9d25f6b90ee (diff) | |
| download | kernel_goldelico_gta04-cbeee13570adfb0af494a07074958e4888c2351c.zip kernel_goldelico_gta04-cbeee13570adfb0af494a07074958e4888c2351c.tar.gz kernel_goldelico_gta04-cbeee13570adfb0af494a07074958e4888c2351c.tar.bz2 | |
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 3e3181c..140c5c5 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 |