X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.32;h=88ead76276b8d393a058fbe119afb43c938d2d5f;hb=7446a3e5a4ecce054b3a78b03f21f2668591e903;hp=fd0d67af5b01024a7c887fcdb9ee291283d861bb;hpb=78a024dc3320b4ff4bc02077e1ab901e9b075106;p=releases.git

diff --git a/deblob-2.6.32 b/deblob-2.6.32
index fd0d67af5b01..88ead76276b8 100755
--- a/deblob-2.6.32
+++ b/deblob-2.6.32
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#    Copyright (C) 2008, 2009, 2010 Alexandre Oliva <lxoliva@fsfla.org>
+#    Copyright (C) 2008, 2009, 2010, 2011 Alexandre Oliva <lxoliva@fsfla.org>
 #    Copyright (C) 2008 Jeff Moe
 #    Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org>
 #
@@ -44,7 +44,7 @@
 
 # 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.32 extra=2
+kver=2.6.32 extra=2++
 
 case $1 in
 --force)
@@ -421,6 +421,9 @@ clean_sed '
 s,\([" ]\)request_firmware(,\1reject_firmware(,
 ' arch/arm/mach-netx/xc.c 'disabled non-Free firmware-loading machinery'
 clean_blob arch/arm/mach-netx/xc.c
+if grep MODULE_FIRMWARE drivers/net/netx-eth.c > /dev/null; then
+  clean_blob drivers/net/netx-eth.c
+fi
 clean_kconfig arch/arm/Kconfig 'ARCH_NETX'
 clean_mk CONFIG_ARCH_NETX arch/arm/Makefile
 
@@ -1026,7 +1029,12 @@ announce NETXEN_NIC - "NetXen Multi port (1/10) Gigabit Ethernet NIC"
 reject_firmware drivers/net/netxen/netxen_nic.h
 reject_firmware drivers/net/netxen/netxen_nic_main.c
 reject_firmware drivers/net/netxen/netxen_nic_init.c
-clean_blob drivers/net/netxen/netxen_nic_init.c
+if grep ROMIMAGE_NAME drivers/net/netxen/netxen_nic_init.c > /dev/null; then
+  clean_blob drivers/net/netxen/netxen_nic.h
+  clean_blob drivers/net/netxen/netxen_nic_main.c
+else
+  clean_blob drivers/net/netxen/netxen_nic_init.c
+fi
 clean_kconfig drivers/net/Kconfig 'NETXEN_NIC'
 clean_mk CONFIG_NETXEN_NIC drivers/net/Makefile
 
@@ -1051,6 +1059,9 @@ announce SPIDER_NET - "Spider Gigabit Ethernet driver"
 reject_firmware drivers/net/spider_net.c
 clean_sed 's,spider_fw\.bin,DEBLOBBED.bin,g' \
   drivers/net/spider_net.c 'removed non-Free firmware notes'
+if grep MODULE_FIRMWARE drivers/net/spider_net.c > /dev/null; then
+  clean_blob drivers/net/spider_net.c
+fi
 clean_blob drivers/net/spider_net.h
 clean_kconfig drivers/net/Kconfig 'SPIDER_NET'
 clean_mk CONFIG_SPIDER_NET drivers/net/Makefile
@@ -1158,6 +1169,7 @@ drop_fw_file firmware/cis/PE-200.cis.ihex firmware/cis/PE-200.cis
 
 announce 3C359 - "3Com 3C359 Token Link Velocity XL adapter"
 drop_fw_file firmware/3com/3C359.bin.ihex firmware/3com/3C359.bin
+reject_firmware drivers/net/tokenring/3c359.c
 clean_blob drivers/net/tokenring/3c359.c
 clean_kconfig drivers/net/tokenring/Kconfig '3C359'
 clean_mk CONFIG_3C359 drivers/net/tokenring/Makefile