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_root.c | |
| parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
| parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index c3fed31166b5..add1a19bbbfe 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
| @@ -206,7 +206,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) | |||
| 206 | root->device = device; | 206 | root->device = device; |
| 207 | strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME); | 207 | strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME); |
| 208 | strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); | 208 | strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); |
| 209 | acpi_driver_data(device) = root; | 209 | device->driver_data = root; |
| 210 | 210 | ||
| 211 | device->ops.bind = acpi_pci_bind; | 211 | device->ops.bind = acpi_pci_bind; |
| 212 | 212 | ||