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

[Frederik Schüler]

Author: fs
Date: Mon Jan  5 18:39:06 2009
New Revision: 12545

Log:
Fix firmware-cleanup.patch. Orig tarball must be rebuilt with this patch.


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	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Mon Jan  5 18:39:06 2009
@@ -1,8 +1,9 @@
-diff --git a/firmware/Makefile b/firmware/Makefile
-index 9fe8604..9a852ae 100644
 --- a/firmware/Makefile
 +++ b/firmware/Makefile
-@@ -20,51 +20,2 @@
+@@ -20,58 +20,8 @@
+ # 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.
+ 
 -fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
 -fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
 -fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
@@ -55,3 +56,6 @@
  fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
 -fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
 -fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin
+ 
+ fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
+