Commit 9f7a3b76 authored by Linus Torvalds's avatar Linus Torvalds

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

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 8cbc52d2 7bc8d827
...@@ -525,7 +525,7 @@ pci_default_setup(struct pci_dev *dev, struct pci_board *board, ...@@ -525,7 +525,7 @@ pci_default_setup(struct pci_dev *dev, struct pci_board *board,
else else
offset += idx * board->uart_offset; offset += idx * board->uart_offset;
maxnr = (pci_resource_len(dev, bar) - board->uart_offset) / maxnr = (pci_resource_len(dev, bar) - board->first_offset) /
(8 << board->reg_shift); (8 << board->reg_shift);
if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr) if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)
......
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