diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
| commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
| tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/misc/eeepc-laptop.c | |
| parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
| parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
Merge branch 'misc' into test
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 5baa10bcaf6d..7b39e0f0f1be 100644 --- a/drivers/misc/eeepc-laptop.c +++ b/drivers/misc/eeepc-laptop.c | |||
| @@ -554,7 +554,7 @@ static int eeepc_hotk_add(struct acpi_device *device) | |||
| 554 | ehotk->handle = device->handle; | 554 | ehotk->handle = device->handle; |
| 555 | strcpy(acpi_device_name(device), EEEPC_HOTK_DEVICE_NAME); | 555 | strcpy(acpi_device_name(device), EEEPC_HOTK_DEVICE_NAME); |
| 556 | strcpy(acpi_device_class(device), EEEPC_HOTK_CLASS); | 556 | strcpy(acpi_device_class(device), EEEPC_HOTK_CLASS); |
| 557 | acpi_driver_data(device) = ehotk; | 557 | device->driver_data = ehotk; |
| 558 | ehotk->device = device; | 558 | ehotk->device = device; |
| 559 | result = eeepc_hotk_check(); | 559 | result = eeepc_hotk_check(); |
| 560 | if (result) | 560 | if (result) |