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

[Ben Hutchings]

Author: benh
Date: Wed Jul 15 02:42:36 2009
New Revision: 13937

Log:
Do not remove av7110 firmware since it is DFSG-free

Modified:
   dists/trunk/linux-2.6/debian/changelog
   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/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Jul 15 02:21:41 2009	(r13936)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jul 15 02:42:36 2009	(r13937)
@@ -19,6 +19,7 @@
   * mga: remove unnecessary change from firmware-loading patch
   * cxgb3: remove PHY firmware and use request_firmware() to load it
   * Add firmware-linux-free package containing DFSG-free firmware
+  * av7110: include firmware source and binary
 
   [ Martin Michlmayr ]
   * [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Wed Jul 15 02:21:41 2009	(r13936)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Wed Jul 15 02:42:36 2009	(r13937)
@@ -6,7 +6,6 @@
 rm firmware/acenic
 rm firmware/adaptec
 rm firmware/advansys
-rm firmware/av7110
 rm firmware/bnx2
 rm firmware/cpia2
 rm firmware/cxgb3

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 Jul 15 02:21:41 2009	(r13936)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Wed Jul 15 02:42:36 2009	(r13937)
@@ -2,7 +2,7 @@
 index 25200d1..c3a4fa8 100644
 --- a/firmware/Makefile
 +++ b/firmware/Makefile
-@@ -20,96 +20,10 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,96 +20,11 @@ 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.
  
@@ -28,7 +28,7 @@
 -fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
 -				   cxgb3/t3c_psram-1.1.0.bin \
 -				   cxgb3/t3fw-7.4.0.bin
--fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
+ fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
 -fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
 -fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
 -			     e100/d102e_ucode.bin