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

[Maximilian Attems]

Author: maks
Date: Mon May  4 07:00:45 2009
New Revision: 13542

Log:
update to 2.6.30-rc4

* fix firmware-cleanup.patch
  keep newly added cis, said to be gpl
  see 99b28c47091db2bb7f594a5088831d341a800a33

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	Mon May  4 06:48:29 2009	(r13541)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May  4 07:00:45 2009	(r13542)
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.30~rc3-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.30~rc4-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	Mon May  4 06:48:29 2009	(r13541)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Mon May  4 07:00:45 2009	(r13542)
@@ -1,8 +1,8 @@
 diff --git a/firmware/Makefile b/firmware/Makefile
-index 142c17a..1d41235 100644
+index 25200d1..c3a4fa8 100644
 --- a/firmware/Makefile
 +++ b/firmware/Makefile
-@@ -20,92 +20,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,93 +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.
  
@@ -32,6 +32,7 @@
 -fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
 -			     e100/d102e_ucode.bin
 -fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
+ fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.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