X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.36;h=3eb265c4f1f5c44f4cb8681f82da389a1ef3833a;hb=029dda82fd810a85acd2bd9ba975aa130efb96b9;hp=8abf761211b1c35c7e846d166b32cfd5b3219212;hpb=af278715a4019733287ca0e90d36da887ca41cb1;p=releases.git

diff --git a/deblob-2.6.36 b/deblob-2.6.36
index 8abf761211b1..3eb265c4f1f5 100755
--- a/deblob-2.6.36
+++ b/deblob-2.6.36
@@ -37,15 +37,14 @@
 # See also:
 # http://wiki.debian.org/KernelFirmwareLicensing
 # svn://svn.debian.org/kernel/dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
-# http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/firmware/firmware-removed
-# http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/gen-kernel
+# http://wiki.gnewsense.org/Builder gen-kernel
 
 # Thanks to Brian Brazil @ gnewsense
 
 
 # For each kver release, start extra with an empty string, then count
 # from 1 if changes are needed that require rebuilding the tarball.
-kver=2.6.36 extra=--rc3
+kver=2.6.36 extra=++
 
 case $1 in
 --force)
@@ -984,7 +983,6 @@ clean_mk CONFIG_CASSINI drivers/net/Makefile
 announce CHELSIO_T3 - "Chelsio AEL 2005 support"
 drop_fw_file firmware/cxgb3/t3b_psram-1.1.0.bin.ihex firmware/cxgb3/t3b_psram-1.1.0.bin
 drop_fw_file firmware/cxgb3/t3c_psram-1.1.0.bin.ihex firmware/cxgb3/t3c_psram-1.1.0.bin
-drop_fw_file firmware/cxgb3/t3fw-7.4.0.bin.ihex firmware/cxgb3/t3fw-7.4.0.bin
 drop_fw_file firmware/cxgb3/t3fw-7.10.0.bin.ihex firmware/cxgb3/t3fw-7.10.0.bin
 drop_fw_file firmware/cxgb3/ael2005_opt_edc.bin.ihex firmware/cxgb3/ael2005_opt_edc.bin
 drop_fw_file firmware/cxgb3/ael2005_twx_edc.bin.ihex firmware/cxgb3/ael2005_twx_edc.bin
@@ -1577,7 +1575,7 @@ reject_firmware drivers/net/wimax/i2400m/fw.c
 clean_blob drivers/net/wimax/i2400m/sdio.c
 clean_blob drivers/net/wimax/i2400m/usb.c
 clean_blob Documentation/wimax/README.i2400m
-clean_kconfig drivers/net/wimax/i2400m/Kconfig CONFIG_WIMAX_I2400M
+clean_kconfig drivers/net/wimax/i2400m/Kconfig 'WIMAX_I2400M'
 clean_mk CONFIG_WIMAX_I2400M drivers/net/wimax/i2400m/Makefile
 
 # infiniband
@@ -1643,6 +1641,12 @@ clean_blob drivers/input/touchscreen/qt602240_ts.c
 clean_kconfig drivers/net/Kconfig 'TOUCHSCREEN_QT602240'
 clean_mk CONFIG_TOUCHSCREEN_QT602240 drivers/input/touchscreen/Makefile
 
+announce LIRC_ZILOG - "Zilog/Hauppauge IR Transmitter"
+reject_firmware drivers/staging/lirc/lirc_zilog.c
+clean_blob drivers/staging/lirc/lirc_zilog.c
+clean_kconfig drivers/staging/lirc/Kconfig 'LIRC_ZILOG'
+clean_mk CONFIG_LIRC_ZILOG drivers/staging/lirc/Makefile
+
 ####################
 # Data acquisition #
 ####################
@@ -2154,16 +2158,6 @@ clean_sed '
 }' sound/oss/Kconfig 'removed default firmware'
 clean_mk CONFIG_SOUND_PSS sound/oss/Makefile
 
-##########
-# Crypto #
-##########
-
-announce DX_SEP - "Discretix SEP driver"
-reject_firmware drivers/staging/sep/sep_driver.c
-clean_blob drivers/staging/sep/sep_driver.c
-clean_kconfig drivers/staging/sep/Kconfig 'DX_SEP'
-clean_mk CONFIG_DX_SEP drivers/staging/sep/Makefile
-
 #################
 # Documentation #
 #################