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

[Ben Hutchings]

Author: benh
Date: Sun Feb 22 23:19:14 2009
New Revision: 12941

Log:
debian/patches/debian/dfsg/{files-1,firmware-cleanup.patch}: Don't remove the dsp56k firmware


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

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Sun Feb 22 23:19:14 2009
@@ -7,7 +7,6 @@
 rm firmware/cpia2
 rm firmware/cxgb3
 rm firmware/dabusb
-rm firmware/dsp56k
 rm firmware/e100
 rm firmware/edgeport
 rm firmware/emi26

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	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Sun Feb 22 23:19:14 2009
@@ -2,7 +2,7 @@
 index 466106f..fea3504 100644
 --- a/firmware/Makefile
 +++ b/firmware/Makefile
-@@ -20,75 +20,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,75 +20,9 @@ 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.
  
@@ -15,7 +15,7 @@
 -fw-shipped-$(CONFIG_ACENIC) += $(acenic-objs)
 -fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \
 -					 adaptec/starfire_tx.bin
--fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
+ fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
 -fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
 -fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
 -fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin