[kernel] r13670 - in dists/trunk/linux-2.6/debian: . patches/debian/dfsg

[Bastian Blank]

Author: waldi
Date: Tue May 26 09:40:55 2009
New Revision: 13670

Log:
* debian/changelog: Set version to 2.6.30~rc7-1~experimental.1.
* debian/patches/debian/dfsg/firmware-cleanup.patch:
  Don't remove unpruned firmwares.

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue May 26 05:49:44 2009	(r13669)
+++ dists/trunk/linux-2.6/debian/changelog	Tue May 26 09:40:55 2009	(r13670)
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.30~rc6-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.30~rc7-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release
     - radeonfb: suspend/resume for ATI Mobility Radeon RV350.

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	Tue May 26 05:49:44 2009	(r13669)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Tue May 26 09:40:55 2009	(r13670)
@@ -2,7 +2,7 @@
 index 25200d1..c3a4fa8 100644
 --- a/firmware/Makefile
 +++ b/firmware/Makefile
-@@ -20,93 +20,9 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,93 +20,10 @@ 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.
  
@@ -16,7 +16,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_BNX2) += bnx2/bnx2-mips-09-4.6.17.fw \
 -			     bnx2/bnx2-rv2p-09-4.6.15.fw \