---

yaml --- r: 135341 b: refs/heads/master c: 0fc36aa h: refs/heads/master i: 135339: 4cb7a86 v: v3
git-mirror · Mar 17, 2009 · 06d521f · 06d521f
1 parent d86eb9b
commit 06d521f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97d759d3e86f9c7ced094352838e7e4d1cf8cddf
+refs/heads/master: 0fc36aa52a602bfe2aeb7ded7e90b0fa70df24c2
diff --git a/trunk/drivers/atm/solos-pci.c b/trunk/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);