aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorLen Brown2006-06-15 15:34:42 -0400
committerLen Brown2006-06-15 15:34:42 -0400
commit59f720eb5a4337b2c4fc0b4c6cfd9c144e492aa8 (patch)
tree455c48b0c8158846fe1e34c226a4389c663f45c4 /drivers/char
parentb3899c6613160b18f79e4356184de55311302fe4 (diff)
parent9224a867c497053842dc595e594ca6d32112221f (diff)
Pull address_range into release branch
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/hpet.c5
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)
status = acpi_resource_to_address64(res, &addr);
if (ACPI_SUCCESS(status)) {
- unsigned long size;
-
- size = addr.maximum - addr.minimum + 1;
hdp->hd_phys_address = addr.minimum;
- hdp->hd_address = ioremap(addr.minimum, size);
+ hdp->hd_address = ioremap(addr.minimum, addr.address_length);
if (hpet_is_known(hdp)) {
printk(KERN_DEBUG "%s: 0x%lx is busy\n",