diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
| commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
| tree | 8b639000418e2756bf6baece4e00e07d2534bccc /drivers/acpi/processor_throttling.c | |
| parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
| parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/acpi/processor_throttling.c')
| -rw-r--r-- | drivers/acpi/processor_throttling.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index fa84e9744330..ad3501739563 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c | |||
| @@ -1164,7 +1164,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, | |||
| 1164 | */ | 1164 | */ |
| 1165 | if (!match_pr->flags.throttling) { | 1165 | if (!match_pr->flags.throttling) { |
| 1166 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 1166 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 1167 | "Throttling Controll is unsupported " | 1167 | "Throttling Control is unsupported " |
| 1168 | "on CPU %d\n", i)); | 1168 | "on CPU %d\n", i)); |
| 1169 | continue; | 1169 | continue; |
| 1170 | } | 1170 | } |