From 3551959746dc9f690dbaeced35f7d5a9cf933ea1 Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Fri, 19 May 2006 16:54:51 -0400 Subject: [PATCH] --- yaml --- r: 32015 b: refs/heads/master c: 432bfaba7d4e70483fc5af164e020066f4921bff h: refs/heads/master i: 32013: 1a1c46370ce5b2276721a749b0f893cc8c9ff3c5 32011: 2aa3a84bc61b9423da41daa2866af52cc96e35a9 32007: 9becfabef93547aff781e885ebfbd94cb15bf939 31999: ed5d4772605f2e11f599c622af7b6e457e443ad3 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/pci_root.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ef9d445e9178..2f5c5ff9942f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0e4e117d4c898b0df749d5b88c86955151abf53 +refs/heads/master: 432bfaba7d4e70483fc5af164e020066f4921bff diff --git a/trunk/drivers/acpi/pci_root.c b/trunk/drivers/acpi/pci_root.c index 22ca3a1f3896..0984a1ee24ed 100644 --- a/trunk/drivers/acpi/pci_root.c +++ b/trunk/drivers/acpi/pci_root.c @@ -58,7 +58,6 @@ static struct acpi_driver acpi_pci_root_driver = { struct acpi_pci_root { struct list_head node; - acpi_handle handle; struct acpi_device * device; struct acpi_pci_id id; struct pci_bus *bus; @@ -171,7 +170,6 @@ static int acpi_pci_root_add(struct acpi_device *device) memset(root, 0, sizeof(struct acpi_pci_root)); INIT_LIST_HEAD(&root->node); - root->handle = device->handle; root->device = device; strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); @@ -317,7 +315,7 @@ static int acpi_pci_root_start(struct acpi_device *device) list_for_each_entry(root, &acpi_pci_roots, node) { - if (root->handle == device->handle) { + if (root->device == device) { pci_bus_add_devices(root->bus); return 0; }