git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ca0106' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
processor_throttling.c
diff --git
a/drivers/acpi/processor_throttling.c
b/drivers/acpi/processor_throttling.c
index 7f16f5f8e7d395616a0d82ae8dbbd8fca8a336fb..227543789ba91db984862f52040fc18d1a7758e9 100644
(file)
--- a/
drivers/acpi/processor_throttling.c
+++ b/
drivers/acpi/processor_throttling.c
@@
-840,7
+840,7
@@
static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
state = acpi_get_throttling_state(pr, value);
if (state == -1) {
ACPI_WARNING((AE_INFO,
- "Invalid throttling state, reset
\n
"));
+ "Invalid throttling state, reset"));
state = 0;
ret = acpi_processor_set_throttling(pr, state);
if (ret)