diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-11 02:30:14 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:37:36 -0400 |
| commit | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (patch) | |
| tree | f1918740d021c0e9658250a016852827a2ca863d /drivers/misc/panasonic-laptop.c | |
| parent | f1e6d3173ece6d60b4d5aeacd3b91a33ff8ec9d3 (diff) | |
| download | lwn-3e2dab9a1c2deb03c311eb3f83466009147ed4d3.tar.gz lwn-3e2dab9a1c2deb03c311eb3f83466009147ed4d3.zip | |
panasonic-laptop: fix build
sync with acpi_driver_data(device)
and acpi_evaluate_integer(..., long long)
changes that happened since this driver
was checked in.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/panasonic-laptop.c')
| -rw-r--r-- | drivers/misc/panasonic-laptop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/panasonic-laptop.c b/drivers/misc/panasonic-laptop.c index 9aecda5a399c..a2cb598d8ab5 100644 --- a/drivers/misc/panasonic-laptop.c +++ b/drivers/misc/panasonic-laptop.c @@ -252,7 +252,7 @@ static int acpi_pcc_write_sset(struct pcc_acpi *pcc, int func, int val) static inline int acpi_pcc_get_sqty(struct acpi_device *device) { - unsigned long s; + unsigned long long s; acpi_status status; ACPI_FUNCTION_TRACE("acpi_pcc_get_sqty"); @@ -500,7 +500,7 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc) struct input_dev *hotk_input_dev = pcc->input_dev; int rc; int key_code, hkey_num; - unsigned long result; + unsigned long long result; ACPI_FUNCTION_TRACE("acpi_pcc_generate_keyinput"); @@ -645,7 +645,7 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device) pcc->device = device; pcc->handle = device->handle; pcc->num_sifr = num_sifr; - acpi_driver_data(device) = pcc; + device->driver_data = pcc; strcpy(acpi_device_name(device), ACPI_PCC_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_PCC_CLASS); |