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/pci_link.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/pci_link.c')
-rw-r--r-- | drivers/acpi/pci_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 65bf4fa59633..fcfdef7b4fdd 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -737,7 +737,7 @@ static int acpi_pci_link_add(struct acpi_device *device) link->device = device; strcpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_PCI_LINK_CLASS); - acpi_driver_data(device) = link; + device->driver_data = link; mutex_lock(&acpi_link_lock); result = acpi_pci_link_get_possible(link); |