summaryrefslogtreecommitdiff
path: root/drivers/acpi/processor_throttling.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-19 02:10:40 -0400
committerLen Brown <len.brown@intel.com>2009-09-19 02:10:40 -0400
commitcbeee13570adfb0af494a07074958e4888c2351c (patch)
tree998d9ff501c4abe19ebe5c262aa5b7052fa80b72 /drivers/acpi/processor_throttling.c
parent7ef0143e2f898f9bf675c81bdf0e045c8dd53c57 (diff)
parentb188e4ce3b7965ecc8d45191042cc9d25f6b90ee (diff)
Merge branch 'processor-procfs-2.6.32' into release
Diffstat (limited to 'drivers/acpi/processor_throttling.c')
-rw-r--r--drivers/acpi/processor_throttling.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index b366b9c13d4d..ce7cf3bc5101 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -1218,7 +1218,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
}
/* proc interface */
-
+#ifdef CONFIG_ACPI_PROCFS
static int acpi_processor_throttling_seq_show(struct seq_file *seq,
void *offset)
{
@@ -1326,3 +1326,4 @@ const struct file_operations acpi_processor_throttling_fops = {
.llseek = seq_lseek,
.release = single_release,
};
+#endif