[kernel] r18942 - in dists/trunk/firmware-nonfree: . debian iwlwifi

[Ben Hutchings]

Author: benh
Date: Mon Apr 16 06:06:08 2012
New Revision: 18942

Log:
Remove Intel Wireless firmware not required by Linux 2.6.32, 3.2 or 3.3

Deleted:
   dists/trunk/firmware-nonfree/iwlwifi/iwlwifi-1000-3.ucode-128.50.3.1
   dists/trunk/firmware-nonfree/iwlwifi/iwlwifi-3945-1.ucode-15.28.1.6
   dists/trunk/firmware-nonfree/iwlwifi/iwlwifi-4965-1.ucode-228.57.1.21
   dists/trunk/firmware-nonfree/iwlwifi/iwlwifi-5000-1.ucode-5.4.A.11
Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/defines
   dists/trunk/firmware-nonfree/iwlwifi/defines

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Mon Apr 16 05:55:41 2012	(r18941)
+++ dists/trunk/firmware-nonfree/debian/changelog	Mon Apr 16 06:06:08 2012	(r18942)
@@ -6,6 +6,7 @@
   * Add Chelsio T3 firmware version 7.10.0 (for Linux 2.6.36 onward)
   * Add Intel Wireless 105, 135, 2200, 2230 firmware
   * Update Intel Wireless 6030 firmware to version 18.168.6.1 (ABI 6)
+  * Remove Intel Wireless firmware not required by Linux 2.6.32, 3.2 or 3.3
   * Update Broadcom NetXtreme II firmware for use with Linux 3.3
     - Fixes iSCSI problems with some LeftHand targets
   * Remove Broadcom NetXtreme II firmware not referenced by Linux 2.6.32,

Modified: dists/trunk/firmware-nonfree/defines
==============================================================================
--- dists/trunk/firmware-nonfree/defines	Mon Apr 16 05:55:41 2012	(r18941)
+++ dists/trunk/firmware-nonfree/defines	Mon Apr 16 06:06:08 2012	(r18942)
@@ -36,7 +36,11 @@
  bnx2x/bnx2x-e*-7.0.2[03].0.fw
 # No Debian release references these versions
  cxgb3/t3fw-7.[01].0.bin
-# No Debian release requires this version
+# No Debian release requires these versions
+ iwlwifi-1000-3.ucode
+ iwlwifi-3945-1.ucode
+ iwlwifi-4965-1.ucode
+ iwlwifi-5000-1.ucode
  iwlwifi-6000g2b-5.ucode
 # No Debian release references these versions
  libertas/gspi8682*.bin

Modified: dists/trunk/firmware-nonfree/iwlwifi/defines
==============================================================================
--- dists/trunk/firmware-nonfree/iwlwifi/defines	Mon Apr 16 05:55:41 2012	(r18941)
+++ dists/trunk/firmware-nonfree/iwlwifi/defines	Mon Apr 16 06:06:08 2012	(r18942)
@@ -4,15 +4,11 @@
  iwlwifi-100-5.ucode
  iwlwifi-105-6.ucode
  iwlwifi-135-6.ucode
- iwlwifi-1000-3.ucode
  iwlwifi-1000-5.ucode
  iwlwifi-2000-6.ucode
  iwlwifi-2030-6.ucode
- iwlwifi-3945-1.ucode
  iwlwifi-3945-2.ucode
- iwlwifi-4965-1.ucode
  iwlwifi-4965-2.ucode
- iwlwifi-5000-1.ucode
  iwlwifi-5000-2.ucode
  iwlwifi-5000-5.ucode
  iwlwifi-5150-2.ucode
@@ -34,9 +30,6 @@
 [iwlwifi-135-6.ucode_base]
 desc: Intel Wireless 135 firmware
 
-[iwlwifi-1000-3.ucode_base]
-desc: Intel Wireless 1000 firmware
-
 [iwlwifi-1000-5.ucode_base]
 desc: Intel Wireless 1000 firmware
 
@@ -46,21 +39,12 @@
 [iwlwifi-2030-6.ucode_base]
 desc: Intel Wireless 2230 firmware
 
-[iwlwifi-3945-1.ucode_base]
-desc: Intel Wireless 3945 firmware
-
 [iwlwifi-3945-2.ucode_base]
 desc: Intel Wireless 3945 firmware
 
-[iwlwifi-4965-1.ucode_base]
-desc: Intel Wireless 4965 firmware
-
 [iwlwifi-4965-2.ucode_base]
 desc: Intel Wireless 4965 firmware
 
-[iwlwifi-5000-1.ucode_base]
-desc: Intel Wireless 5100, 5300 and 5350 firmware
-
 [iwlwifi-5000-2.ucode_base]
 desc: Intel Wireless 5100, 5300 and 5350 firmware