X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.38;h=6b6b75a9315a0afe3c26a5caf1d79c5ba4acb993;hb=2e60cf38f3d856583ffa67387afa575674858194;hp=9132ddc8c3a4a9e9b6d1e3694d7602411c3c657b;hpb=77f19a75ad70b6eb2c43337f89a12644404e4621;p=releases.git

diff --git a/deblob-2.6.38 b/deblob-2.6.38
index 9132ddc8c3a4..6b6b75a9315a 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=
+kver=2.6.38 extra=0++
 
 case $1 in
 --force)
@@ -1381,15 +1381,24 @@ clean_mk CONFIG_ORINOCO_USB drivers/net/wireless/orinoco/Makefile
 announce WLAGS49_H2 - 'Agere Systems HERMES II Wireless PC Card Model 0110'
 # Some pieces of the firmware images are most definitely data, but
 # others seem to be code.
-clean_file drivers/staging/wlags49_h2/ap_h2.c
-clean_file drivers/staging/wlags49_h2/sta_h2.c
+clean_blob drivers/staging/wlags49_h2/ap_h2.c
+clean_blob drivers/staging/wlags49_h2/sta_h2.c
+echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/ap_h2.c
+echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/sta_h2.c
 clean_blob drivers/staging/wlags49_h2/wl_profile.c
+clean_sed '
+  s,\(.*hcf_status = \)dhf_download_fw(.*&fw_image );,//& /*(DEBLOBBED)*/\n\1HCF_ERR_INCOMP_FW;,
+' drivers/staging/wlags49_h2/wl_main.c 'reject built-in non-Free firmware'
 clean_kconfig drivers/staging/wlags49_h2/Kconfig 'WLAGS49_H2'
 clean_mk CONFIG_WLAGS49_H2 drivers/staging/Makefile
 
 announce WLAGS49_H25 - 'Linksys Systems HERMES II.5 Wireless-G_CompactFlash_Card'
-clean_file drivers/staging/wlags49_h2/ap_h25.c
-clean_file drivers/staging/wlags49_h2/sta_h25.c
+# Some pieces of the firmware images are most definitely data, but
+# others seem to be code.
+clean_blob drivers/staging/wlags49_h2/ap_h25.c
+clean_blob drivers/staging/wlags49_h2/sta_h25.c
+echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/ap_h25.c
+echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/sta_h25.c
 clean_kconfig drivers/staging/wlags49_h25/Kconfig 'WLAGS49_H25'
 clean_mk CONFIG_WLAGS49_H25 drivers/staging/Makefile
 
@@ -1821,7 +1830,7 @@ clean_mk CONFIG_SERIAL_QE drivers/tty/serial/Makefile
 announce TOUCHSCREEN_QT602240 - "QT602240 I2C Touchscreen"
 reject_firmware drivers/input/touchscreen/qt602240_ts.c
 clean_blob drivers/input/touchscreen/qt602240_ts.c
-clean_kconfig drivers/net/Kconfig 'TOUCHSCREEN_QT602240'
+clean_kconfig drivers/input/touchscreen/Kconfig 'TOUCHSCREEN_QT602240'
 clean_mk CONFIG_TOUCHSCREEN_QT602240 drivers/input/touchscreen/Makefile
 
 announce LIRC_ZILOG - "Zilog/Hauppauge IR Transmitter"