diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /drivers/acpi/glue.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/acpi/glue.c')
| -rw-r--r-- | drivers/acpi/glue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index aa993715d644..8daef57b994c 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
| @@ -99,15 +99,15 @@ do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data) | |||
| 99 | unsigned long *busnr = (unsigned long *)data; | 99 | unsigned long *busnr = (unsigned long *)data; |
| 100 | struct acpi_resource_address64 address; | 100 | struct acpi_resource_address64 address; |
| 101 | 101 | ||
| 102 | if (resource->id != ACPI_RSTYPE_ADDRESS16 && | 102 | if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 && |
| 103 | resource->id != ACPI_RSTYPE_ADDRESS32 && | 103 | resource->type != ACPI_RESOURCE_TYPE_ADDRESS32 && |
| 104 | resource->id != ACPI_RSTYPE_ADDRESS64) | 104 | resource->type != ACPI_RESOURCE_TYPE_ADDRESS64) |
| 105 | return AE_OK; | 105 | return AE_OK; |
| 106 | 106 | ||
| 107 | acpi_resource_to_address64(resource, &address); | 107 | acpi_resource_to_address64(resource, &address); |
| 108 | if ((address.address_length > 0) && | 108 | if ((address.address_length > 0) && |
| 109 | (address.resource_type == ACPI_BUS_NUMBER_RANGE)) | 109 | (address.resource_type == ACPI_BUS_NUMBER_RANGE)) |
| 110 | *busnr = address.min_address_range; | 110 | *busnr = address.minimum; |
| 111 | 111 | ||
| 112 | return AE_OK; | 112 | return AE_OK; |
| 113 | } | 113 | } |