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 7c6dfd03de9f..967ecec82577 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c | |||
@@ -280,7 +280,7 @@ static int write_acpi_int(acpi_handle handle, const char *method, int val, | |||
280 | 280 | ||
281 | static int read_wireless_status(int mask) | 281 | static int read_wireless_status(int mask) |
282 | { | 282 | { |
283 | ulong status; | 283 | unsigned long long status; |
284 | acpi_status rv = AE_OK; | 284 | acpi_status rv = AE_OK; |
285 | 285 | ||
286 | if (!wireless_status_handle) | 286 | if (!wireless_status_handle) |
@@ -297,7 +297,7 @@ static int read_wireless_status(int mask) | |||
297 | 297 | ||
298 | static int read_gps_status(void) | 298 | static int read_gps_status(void) |
299 | { | 299 | { |
300 | ulong status; | 300 | unsigned long long status; |
301 | acpi_status rv = AE_OK; | 301 | acpi_status rv = AE_OK; |
302 | 302 | ||
303 | rv = acpi_evaluate_integer(gps_status_handle, NULL, NULL, &status); | 303 | rv = acpi_evaluate_integer(gps_status_handle, NULL, NULL, &status); |
@@ -404,7 +404,7 @@ static void lcd_blank(int blank) | |||
404 | 404 | ||
405 | static int read_brightness(struct backlight_device *bd) | 405 | static int read_brightness(struct backlight_device *bd) |
406 | { | 406 | { |
407 | ulong value; | 407 | unsigned long long value; |
408 | acpi_status rv = AE_OK; | 408 | acpi_status rv = AE_OK; |
409 | 409 | ||
410 | rv = acpi_evaluate_integer(brightness_get_handle, NULL, NULL, &value); | 410 | rv = acpi_evaluate_integer(brightness_get_handle, NULL, NULL, &value); |
@@ -455,7 +455,7 @@ static ssize_t show_infos(struct device *dev, | |||
455 | struct device_attribute *attr, char *page) | 455 | struct device_attribute *attr, char *page) |
456 | { | 456 | { |
457 | int len = 0; | 457 | int len = 0; |
458 | ulong temp; | 458 | unsigned long long temp; |
459 | char buf[16]; //enough for all info | 459 | char buf[16]; //enough for all info |
460 | acpi_status rv = AE_OK; | 460 | acpi_status rv = AE_OK; |
461 | 461 | ||
@@ -603,7 +603,7 @@ static void set_display(int value) | |||
603 | 603 | ||
604 | static int read_display(void) | 604 | static int read_display(void) |
605 | { | 605 | { |
606 | ulong value = 0; | 606 | unsigned long long value = 0; |
607 | acpi_status rv = AE_OK; | 607 | acpi_status rv = AE_OK; |
608 | 608 | ||
609 | /* In most of the case, we know how to set the display, but sometime | 609 | /* In most of the case, we know how to set the display, but sometime |
@@ -849,7 +849,7 @@ static int asus_hotk_get_info(void) | |||
849 | { | 849 | { |
850 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 850 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
851 | union acpi_object *model = NULL; | 851 | union acpi_object *model = NULL; |
852 | ulong bsts_result, hwrs_result; | 852 | unsigned long long bsts_result, hwrs_result; |
853 | char *string = NULL; | 853 | char *string = NULL; |
854 | acpi_status status; | 854 | acpi_status status; |
855 | 855 | ||