Commit 2ef21770 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial

into home.osdl.org:/home/torvalds/v2.5/linux
parents 412f9e8b 666f988e
...@@ -28,8 +28,7 @@ static acpi_status acpi_serial_mmio(struct serial_struct *req, ...@@ -28,8 +28,7 @@ static acpi_status acpi_serial_mmio(struct serial_struct *req,
req->iomem_base = ioremap(req->iomap_base, size); req->iomem_base = ioremap(req->iomap_base, size);
if (!req->iomem_base) { if (!req->iomem_base) {
printk(KERN_ERR "%s: couldn't ioremap 0x%lx-0x%lx\n", printk(KERN_ERR "%s: couldn't ioremap 0x%lx-0x%lx\n",
__FUNCTION__, addr->min_address_range, __FUNCTION__, req->iomap_base, req->iomap_base + size);
addr->max_address_range);
return AE_ERROR; return AE_ERROR;
} }
req->io_type = SERIAL_IO_MEM; req->io_type = SERIAL_IO_MEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment