git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'processor-procfs-2.6.32' into release
[pandora-kernel.git]
/
drivers
/
acpi
/
processor_throttling.c
diff --git
a/drivers/acpi/processor_throttling.c
b/drivers/acpi/processor_throttling.c
index
b366b9c
..
ce7cf3b
100644
(file)
--- 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