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/acpi/pci_link.c | |
| parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
| parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
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) | |||
| 737 | link->device = device; | 737 | link->device = device; |
| 738 | strcpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME); | 738 | strcpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME); |
| 739 | strcpy(acpi_device_class(device), ACPI_PCI_LINK_CLASS); | 739 | strcpy(acpi_device_class(device), ACPI_PCI_LINK_CLASS); |
| 740 | acpi_driver_data(device) = link; | 740 | device->driver_data = link; |
| 741 | 741 | ||
| 742 | mutex_lock(&acpi_link_lock); | 742 | mutex_lock(&acpi_link_lock); |
| 743 | result = acpi_pci_link_get_possible(link); | 743 | result = acpi_pci_link_get_possible(link); |