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/asus_acpi.c | |
| parent | 0ca9413c234aa5a49ffaf80e46b50721a752e45a (diff) | |
| parent | 27663c5855b10af9ec67bc7dfba001426ba21222 (diff) | |
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/asus_acpi.c')
| -rw-r--r-- | drivers/acpi/asus_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 2377e8b917d7..1e74988c7b2d 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c @@ -753,7 +753,7 @@ static int get_lcd_state(void) /* That's what the AML code does */ lcd = out_obj.integer.value >> 8; } else if (hotk->model == F3Sa) { - unsigned long tmp; + unsigned long long tmp; union acpi_object param; struct acpi_object_list input; acpi_status status; |