diff options
Diffstat (limited to 'drivers/misc/asus-laptop.c')
-rw-r--r-- | drivers/misc/asus-laptop.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index 57d81c713eab..a9d5228724a6 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c | |||
@@ -281,7 +281,7 @@ static int write_acpi_int(acpi_handle handle, const char *method, int val, | |||
281 | 281 | ||
282 | static int read_wireless_status(int mask) | 282 | static int read_wireless_status(int mask) |
283 | { | 283 | { |
284 | ulong status; | 284 | unsigned long long status; |
285 | acpi_status rv = AE_OK; | 285 | acpi_status rv = AE_OK; |
286 | 286 | ||
287 | if (!wireless_status_handle) | 287 | if (!wireless_status_handle) |
@@ -298,7 +298,7 @@ static int read_wireless_status(int mask) | |||
298 | 298 | ||
299 | static int read_gps_status(void) | 299 | static int read_gps_status(void) |
300 | { | 300 | { |
301 | ulong status; | 301 | unsigned long long status; |
302 | acpi_status rv = AE_OK; | 302 | acpi_status rv = AE_OK; |
303 | 303 | ||
304 | rv = acpi_evaluate_integer(gps_status_handle, NULL, NULL, &status); | 304 | rv = acpi_evaluate_integer(gps_status_handle, NULL, NULL, &status); |
@@ -405,7 +405,7 @@ static void lcd_blank(int blank) | |||
405 | 405 | ||
406 | static int read_brightness(struct backlight_device *bd) | 406 | static int read_brightness(struct backlight_device *bd) |
407 | { | 407 | { |
408 | ulong value; | 408 | unsigned long long value; |
409 | acpi_status rv = AE_OK; | 409 | acpi_status rv = AE_OK; |
410 | 410 | ||
411 | rv = acpi_evaluate_integer(brightness_get_handle, NULL, NULL, &value); | 411 | rv = acpi_evaluate_integer(brightness_get_handle, NULL, NULL, &value); |
@@ -456,7 +456,7 @@ static ssize_t show_infos(struct device *dev, | |||
456 | struct device_attribute *attr, char *page) | 456 | struct device_attribute *attr, char *page) |
457 | { | 457 | { |
458 | int len = 0; | 458 | int len = 0; |
459 | ulong temp; | 459 | unsigned long long temp; |
460 | char buf[16]; //enough for all info | 460 | char buf[16]; //enough for all info |
461 | acpi_status rv = AE_OK; | 461 | acpi_status rv = AE_OK; |
462 | 462 | ||
@@ -604,7 +604,7 @@ static void set_display(int value) | |||
604 | 604 | ||
605 | static int read_display(void) | 605 | static int read_display(void) |
606 | { | 606 | { |
607 | ulong value = 0; | 607 | unsigned long long value = 0; |
608 | acpi_status rv = AE_OK; | 608 | acpi_status rv = AE_OK; |
609 | 609 | ||
610 | /* In most of the case, we know how to set the display, but sometime | 610 | /* In most of the case, we know how to set the display, but sometime |
@@ -850,7 +850,7 @@ static int asus_hotk_get_info(void) | |||
850 | { | 850 | { |
851 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 851 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
852 | union acpi_object *model = NULL; | 852 | union acpi_object *model = NULL; |
853 | ulong bsts_result, hwrs_result; | 853 | unsigned long long bsts_result, hwrs_result; |
854 | char *string = NULL; | 854 | char *string = NULL; |
855 | acpi_status status; | 855 | acpi_status status; |
856 | 856 | ||