diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-23 05:28:38 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 05:28:38 +0200 |
| commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
| tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/ec.c | |
| parent | Merge branch 'i7300_idle' into test (diff) | |
| parent | asus-laptop: Fix the led behavior with value > 1 (diff) | |
| download | linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.xz linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.zip | |
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 4178d17aa0ed..40fefba6264e 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -799,7 +799,7 @@ static int acpi_ec_add(struct acpi_device *device) if (!first_ec) first_ec = ec; - acpi_driver_data(device) = ec; + device->driver_data = ec; acpi_ec_add_fs(device); pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n", ec->gpe, ec->command_addr, ec->data_addr); @@ -824,7 +824,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type) } mutex_unlock(&ec->lock); acpi_ec_remove_fs(device); - acpi_driver_data(device) = NULL; + device->driver_data = NULL; if (ec == first_ec) first_ec = NULL; kfree(ec); |