diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-08-15 21:25:04 -0400 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-08-15 21:25:04 -0400 |
| commit | 6b791e936c15ccace22dc2e4cb6d7d7196423ba7 (patch) | |
| tree | 2c4426784944f8ccf811714bb9aeb8fb9474b10f | |
| parent | 22d9aac23562ea0e921db152f11cf39e3c2b9945 (diff) | |
| parent | 924e61a90f61b1c22fcb51aaf3afc065399cec81 (diff) | |
Merge branch 'thermal-fix' into release-2.6.27
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 80e32093e977..80c251ec6d2a 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
| @@ -71,7 +71,7 @@ static DEFINE_MUTEX(performance_mutex); | |||
| 71 | * 1 -> ignore _PPC totally -> forced by user through boot param | 71 | * 1 -> ignore _PPC totally -> forced by user through boot param |
| 72 | */ | 72 | */ |
| 73 | static int ignore_ppc = -1; | 73 | static int ignore_ppc = -1; |
| 74 | module_param(ignore_ppc, uint, 0644); | 74 | module_param(ignore_ppc, int, 0644); |
| 75 | MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \ | 75 | MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \ |
| 76 | "limited by BIOS, this should help"); | 76 | "limited by BIOS, this should help"); |
| 77 | 77 | ||