diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:33:29 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:33:29 -0400 |
| commit | 7674416db4ee3d43813dddb650364ca994755256 (patch) | |
| tree | 1a4549823d7bdd892dc3b3b7b3fa9214216ac384 /drivers/acpi/processor_throttling.c | |
| parent | 0ca9413c234aa5a49ffaf80e46b50721a752e45a (diff) | |
| parent | 27663c5855b10af9ec67bc7dfba001426ba21222 (diff) | |
| download | blackbird-op-linux-7674416db4ee3d43813dddb650364ca994755256.tar.gz blackbird-op-linux-7674416db4ee3d43813dddb650364ca994755256.zip | |
Merge branch 'ull' into test
Conflicts:
drivers/acpi/bay.c
drivers/acpi/dock.c
drivers/ata/libata-acpi.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 e89a25824f2a..3da2df93d924 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c @@ -274,7 +274,7 @@ static int acpi_processor_throttling_notifier(unsigned long event, void *data) static int acpi_processor_get_platform_limit(struct acpi_processor *pr) { acpi_status status = 0; - unsigned long tpc = 0; + unsigned long long tpc = 0; if (!pr) return -EINVAL; |
