diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-08 12:38:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-08 12:38:28 -0800 |
| commit | d0eaeec8e8dfdc31815941054802dcccd7c3fe1d (patch) | |
| tree | d7b0d172b7b9b3476c15e2cb001af2d4f8b6a39e /drivers/atm/solos-pci.c | |
| parent | a7bcf21e60c73cb7f7c13fad928967d7e47c3cac (diff) | |
| parent | aa58163a76a3aef33c7220931543d45d0fe43753 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/atm/solos-pci.c')
| -rw-r--r-- | drivers/atm/solos-pci.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index f46138ab38b6..2e08c996fd30 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c @@ -1161,6 +1161,14 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) dev_info(&dev->dev, "Solos FPGA Version %d.%02d svn-%d\n", major_ver, minor_ver, fpga_ver); + if (fpga_ver < 37 && (fpga_upgrade || firmware_upgrade || + db_fpga_upgrade || db_firmware_upgrade)) { + dev_warn(&dev->dev, + "FPGA too old; cannot upgrade flash. Use JTAG.\n"); + fpga_upgrade = firmware_upgrade = 0; + db_fpga_upgrade = db_firmware_upgrade = 0; + } + if (card->fpga_version >= DMA_SUPPORTED){ card->using_dma = 1; } else { |