diff options
author | Len Brown <len.brown@intel.com> | 2008-10-23 07:28:38 +0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-23 07:28:38 +0400 |
commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/ac.c | |
parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
download | linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.xz |
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/ac.c')
-rw-r--r-- | drivers/acpi/ac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 831883b7d6c9..8b6a84a43b15 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -269,7 +269,7 @@ static int acpi_ac_add(struct acpi_device *device) ac->device = device; strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_AC_CLASS); - acpi_driver_data(device) = ac; + device->driver_data = ac; result = acpi_ac_get_state(ac); if (result) |