Commit d1f880ab authored by Linus Torvalds's avatar Linus Torvalds

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 8cd13562 1e5c102c
......@@ -127,7 +127,7 @@ setup_port(struct pci_dev *dev, struct serial_struct *req,
return -ENOMEM;
req->io_type = UPIO_MEM;
req->iomap_base = port;
req->iomap_base = port + offset;
req->iomem_base = priv->remapped_bar[bar] + offset;
req->iomem_reg_shift = regshift;
} else {
......
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