From 7446a3e5a4ecce054b3a78b03f21f2668591e903 Mon Sep 17 00:00:00 2001 From: lxoliva Date: Tue, 10 May 2011 05:14:15 +0000 Subject: [PATCH] More changes to netxen, netx and spider for changes introduced in 2.6.32.40. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@7921 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-2.6.32 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/deblob-2.6.32 b/deblob-2.6.32 index 1c7ebcf38ce..88ead76276b 100755 --- a/deblob-2.6.32 +++ b/deblob-2.6.32 @@ -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,8 +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 -grep ROMIMAGE_NAME drivers/net/netxen/netxen_nic_init.c > /dev/null || -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 @@ -1052,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 -- 2.31.1