diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 22:06:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 22:06:15 -0800 |
| commit | 59ed2f59e4ea6a32f9591e378da7935f713a7000 (patch) | |
| tree | a1276a611dbb1bc44685ef8af363e99603e60047 /drivers/acpi/glue.c | |
| parent | 9ad11ab48b1ad618bf47076e9e579f267f5306c2 (diff) | |
| parent | b8e4d89357fc434618a59c1047cac72641191805 (diff) | |
| download | op-kernel-dev-59ed2f59e4ea6a32f9591e378da7935f713a7000.zip op-kernel-dev-59ed2f59e4ea6a32f9591e378da7935f713a7000.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
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 aa99371..8daef57 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) unsigned long *busnr = (unsigned long *)data; struct acpi_resource_address64 address; - if (resource->id != ACPI_RSTYPE_ADDRESS16 && - resource->id != ACPI_RSTYPE_ADDRESS32 && - resource->id != ACPI_RSTYPE_ADDRESS64) + if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 && + resource->type != ACPI_RESOURCE_TYPE_ADDRESS32 && + resource->type != ACPI_RESOURCE_TYPE_ADDRESS64) return AE_OK; acpi_resource_to_address64(resource, &address); if ((address.address_length > 0) && (address.resource_type == ACPI_BUS_NUMBER_RANGE)) - *busnr = address.min_address_range; + *busnr = address.minimum; return AE_OK; } |
