[kernel] r14938 - in dists/trunk/firmware-nonfree: debian qlogic

[Ben Hutchings]

Author: benh
Date: Wed Jan 13 04:18:22 2010
New Revision: 14938

Log:
Update firmware-qlogic description to specify supported chips as named in pci-ids (Closes: #513140)

Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/qlogic/defines

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Wed Jan 13 01:51:14 2010	(r14937)
+++ dists/trunk/firmware-nonfree/debian/changelog	Wed Jan 13 04:18:22 2010	(r14938)
@@ -1,3 +1,11 @@
+firmware-nonfree (0.23) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * Update firmware-qlogic description to specify supported chips as
+    named in pci-ids (Closes: #513140)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 13 Jan 2010 04:11:02 +0000
+
 firmware-nonfree (0.22) unstable; urgency=low
 
   [ maximilian attems ]

Modified: dists/trunk/firmware-nonfree/qlogic/defines
==============================================================================
--- dists/trunk/firmware-nonfree/qlogic/defines	Wed Jan 13 01:51:14 2010	(r14937)
+++ dists/trunk/firmware-nonfree/qlogic/defines	Wed Jan 13 04:18:22 2010	(r14938)
@@ -1,5 +1,5 @@
 [base]
-desc: QLogic IBA7220, QLA1XXX and QLA2XXX
+desc: QLogic IBA7220, QLA1xxx, ISP2xxx and SP2x2
 files:
  qlogic/1040.bin
  qlogic/1280.bin
@@ -11,9 +11,9 @@
  ql2322_fw.bin
  ql2400_fw.bin
  ql2500_fw.bin
-longdesc: QLogic IBA7220 (Infiniband), QLA1XXX (SCSI) and QLA2XXX
- (Fibre Channel) host adapters supported by the ip_iband, qla1280 and
- qla2xxx drivers
+longdesc: QLogic IBA7220 (Infiniband), QLA1xxx (SCSI), ISP2xxx- and
+ SP2x2-based (Fibre Channel/FCoE) host adapters supported by the ip_iband,
+ qla1280 and qla2xxx drivers
 support: initramfs-tools
 uri: ftp://ftp.qlogic.com/outgoing/linux/firmware/
 
@@ -33,19 +33,19 @@
 desc: QLogic IBA7220 serdes firmware
 
 [ql2100_fw.bin_base]
-desc: QLogic QLA21XX firmware
+desc: QLogic QLA2100 firmware
 
 [ql2200_fw.bin_base]
-desc: QLogic QLA22XX firmware
+desc: QLogic QLA2200 firmware
 
 [ql2300_fw.bin_base]
-desc: QLogic QLA2300, 2312, 6312 firmware
+desc: QLogic QLA2300, ISP2312, SP202 firmware
 
 [ql2322_fw.bin_base]
-desc: QLogic QLA2322, 6322 firmware
+desc: QLogic ISP2322, SP212 firmware
 
 [ql2400_fw.bin_base]
-desc: QLogic QLA24XX firmware
+desc: QLogic ISP2422, ISP2432[M], SP222, SP232 firmware
 
 [ql2500_fw.bin_base]
-desc: QLogic QLA25XX firmware
+desc: QLogic ISP2532 firmware