diff options
author | Len Brown <len.brown@intel.com> | 2006-06-15 15:34:42 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:34:42 -0400 |
commit | 59f720eb5a4337b2c4fc0b4c6cfd9c144e492aa8 (patch) | |
tree | 455c48b0c8158846fe1e34c226a4389c663f45c4 /drivers/char | |
parent | b3899c6613160b18f79e4356184de55311302fe4 (diff) | |
parent | 9224a867c497053842dc595e594ca6d32112221f (diff) |
Pull address_range into release branch
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/hpet.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index ef140ebde117..07473cd84121 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
@@ -925,11 +925,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) | |||
925 | status = acpi_resource_to_address64(res, &addr); | 925 | status = acpi_resource_to_address64(res, &addr); |
926 | 926 | ||
927 | if (ACPI_SUCCESS(status)) { | 927 | if (ACPI_SUCCESS(status)) { |
928 | unsigned long size; | ||
929 | |||
930 | size = addr.maximum - addr.minimum + 1; | ||
931 | hdp->hd_phys_address = addr.minimum; | 928 | hdp->hd_phys_address = addr.minimum; |
932 | hdp->hd_address = ioremap(addr.minimum, size); | 929 | hdp->hd_address = ioremap(addr.minimum, addr.address_length); |
933 | 930 | ||
934 | if (hpet_is_known(hdp)) { | 931 | if (hpet_is_known(hdp)) { |
935 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", | 932 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", |