diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
| commit | 33052057e3e2db7f37fc78aa3f25c98f7e989fae (patch) | |
| tree | e80a3aa1371f513c833dc94a16674f78faeeeb1d /drivers/acpi/pci_root.c | |
| parent | 00b464debf0038b1628996065f0be564ccfbfd86 (diff) | |
| parent | 1113a7e92e483074c6235da59460759e33b9b144 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 0fd9988c283d..4c313eab6313 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
| @@ -122,15 +122,15 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data) | |||
| 122 | int *busnr = (int *)data; | 122 | int *busnr = (int *)data; |
| 123 | struct acpi_resource_address64 address; | 123 | struct acpi_resource_address64 address; |
| 124 | 124 | ||
| 125 | if (resource->id != ACPI_RSTYPE_ADDRESS16 && | 125 | if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 && |
| 126 | resource->id != ACPI_RSTYPE_ADDRESS32 && | 126 | resource->type != ACPI_RESOURCE_TYPE_ADDRESS32 && |
| 127 | resource->id != ACPI_RSTYPE_ADDRESS64) | 127 | resource->type != ACPI_RESOURCE_TYPE_ADDRESS64) |
| 128 | return AE_OK; | 128 | return AE_OK; |
| 129 | 129 | ||
| 130 | acpi_resource_to_address64(resource, &address); | 130 | acpi_resource_to_address64(resource, &address); |
| 131 | if ((address.address_length > 0) && | 131 | if ((address.address_length > 0) && |
| 132 | (address.resource_type == ACPI_BUS_NUMBER_RANGE)) | 132 | (address.resource_type == ACPI_BUS_NUMBER_RANGE)) |
| 133 | *busnr = address.min_address_range; | 133 | *busnr = address.minimum; |
| 134 | 134 | ||
| 135 | return AE_OK; | 135 | return AE_OK; |
| 136 | } | 136 | } |