From 06d521f04d02e38dfddd8e77a1d917b50c79875f Mon Sep 17 00:00:00 2001
From: Nathan Williams <nathan@traverse.com.au>
Date: Sat, 7 Feb 2009 10:19:13 +1100
Subject: [PATCH] --- yaml --- r: 135341 b: refs/heads/master c:
 0fc36aa52a602bfe2aeb7ded7e90b0fa70df24c2 h: refs/heads/master i:   135339:
 4cb7a8607a153e4e720f4b302e8c7c21077f8e47 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/atm/solos-pci.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d96b2242ea79..576fb7ea622f 100644
--- 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
index 1ff730497217..6fe8f8fc8553 100644
--- 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);