summaryrefslogtreecommitdiff
path: root/drivers/acpi/pci_link.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-10-23 07:28:38 +0400
committerLen Brown <len.brown@intel.com>2008-10-23 07:28:38 +0400
commit5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch)
tree1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/pci_link.c
parent530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff)
parente3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff)
downloadlinux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.xz
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/pci_link.c')
-rw-r--r--drivers/acpi/pci_link.c2
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);