X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.38;h=9132ddc8c3a4a9e9b6d1e3694d7602411c3c657b;hb=fbe8de518f2c8ce232b2ec0723b79168b9692842;hp=68a7b47f3dbafaa3762f6f26f56654a27812ca4b;hpb=138f7981bf42ecafd9f6d7fbc2636b7b52988a95;p=releases.git

diff --git a/deblob-2.6.38 b/deblob-2.6.38
index 68a7b47f3dba..9132ddc8c3a4 100755
--- a/deblob-2.6.38
+++ b/deblob-2.6.38
@@ -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.38 extra=0-
+kver=2.6.38 extra=
 
 case $1 in
 --force)
@@ -1155,12 +1155,7 @@ clean_kconfig drivers/net/Kconfig 'QLCNIC'
 clean_mk CONFIG_QLCNIC drivers/net/qlcnic/Makefile
 
 announce R8169 - "Realtek 8169 gigabit ethernet support"
-clean_sed '
-/^static void rtl_hw_phy_config(.*)$/,/^}$/{
-  /rtl8168d_[12]_hw_phy_config([^,)]*);$/i\
-		printk(KERN_ERR PFX "%s: Missing Free firmware\\n", dev->name);
-}
-' drivers/net/r8169.c 'report missing Free firmware'
+reject_firmware drivers/net/r8169.c
 clean_blob drivers/net/r8169.c
 clean_kconfig drivers/net/Kconfig R8169
 clean_mk CONFIG_R8169 drivers/net/Makefile
@@ -1290,6 +1285,7 @@ drop_fw_file firmware/cis/PE520.cis.ihex firmware/cis/PE520.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
@@ -1763,7 +1759,7 @@ clean_blob drivers/net/can/softing/softing_platform.h
 clean_sed '
 /^config CAN_SOFTING_CS$/,${
   /You need firmware/i\
-	/*(DEBLOBBED)*/
+	  /*(DEBLOBBED)*/
   /You need firmware/,/softing-fw.*tar\.gz/d
 }' drivers/net/can/softing/Kconfig 'removed firmware notes'
 clean_kconfig drivers/net/can/softing/Kconfig 'CAN_SOFTING_CS'