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/misc/eeepc-laptop.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/misc/eeepc-laptop.c')
| -rw-r--r-- | drivers/misc/eeepc-laptop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c index 7b39e0f0f1be..9ef98b2d5039 100644 --- a/drivers/misc/eeepc-laptop.c +++ b/drivers/misc/eeepc-laptop.c | |||
| @@ -231,7 +231,7 @@ static int write_acpi_int(acpi_handle handle, const char *method, int val, | |||
| 231 | static int read_acpi_int(acpi_handle handle, const char *method, int *val) | 231 | static int read_acpi_int(acpi_handle handle, const char *method, int *val) |
| 232 | { | 232 | { |
| 233 | acpi_status status; | 233 | acpi_status status; |
| 234 | ulong result; | 234 | unsigned long long result; |
| 235 | 235 | ||
| 236 | status = acpi_evaluate_integer(handle, (char *)method, NULL, &result); | 236 | status = acpi_evaluate_integer(handle, (char *)method, NULL, &result); |
| 237 | if (ACPI_FAILURE(status)) { | 237 | if (ACPI_FAILURE(status)) { |