[kernel] r14538 - dists/trunk/linux-2.6/debian/patches/debian/dfsg

[Ben Hutchings]

Author: benh
Date: Wed Nov  4 00:40:17 2009
New Revision: 14538

Log:
Refresh for 2.6.32-rc6

Modified:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Wed Nov  4 00:33:53 2009	(r14537)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Wed Nov  4 00:40:17 2009	(r14538)
@@ -1,6 +1,6 @@
 --- a/firmware/Makefile
 +++ b/firmware/Makefile
-@@ -20,120 +20,13 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,122 +20,13 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
  # accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
  # But be aware that the config file might not be included at all.
  
@@ -53,11 +53,13 @@
 -fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
  fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
  				     cis/DP83903.cis cis/NE2K.cis \
- 				     cis/tamarack.cis
+ 				     cis/tamarack.cis cis/PE-200.cis
 -fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
 -fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
 -fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
--				       cis/COMpad2.cis cis/COMpad4.cis
+-				       cis/COMpad2.cis cis/COMpad4.cis \
+-				       cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
+-				       cis/SW_8xx_SER.cis
 -fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
 -fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
 -				      advansys/3550.bin advansys/38C0800.bin