summaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorNathan Williams <nathan@traverse.com.au>2009-02-07 10:19:13 +1100
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-03-17 15:01:02 +0000
commit0fc36aa52a602bfe2aeb7ded7e90b0fa70df24c2 (patch)
tree358184042c81a0294a30602bebdfbf1eaf731e5f /drivers/atm
parent97d759d3e86f9c7ced094352838e7e4d1cf8cddf (diff)
downloadlinux-stable-0fc36aa52a602bfe2aeb7ded7e90b0fa70df24c2.tar.gz
linux-stable-0fc36aa52a602bfe2aeb7ded7e90b0fa70df24c2.tar.bz2
linux-stable-0fc36aa52a602bfe2aeb7ded7e90b0fa70df24c2.zip
solos: Automatically determine number of ports
Signed-off-by: Nathan Williams <nathan@traverse.com.au> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/solos-pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 1ff730497217..6fe8f8fc8553 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -1104,7 +1104,8 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
}
- card->nr_ports = 2; /* FIXME: Detect daughterboard */
+ data32 = ioread32(card->config_regs + PORTS);
+ card->nr_ports = (data32 & 0x000000FF);
pci_set_drvdata(dev, card);