Adjust for ar9k changes in patch-2.6.36.2.

[releases.git] / deblob-2.6.33

diff --git a/deblob-2.6.33 b/deblob-2.6.33
index 2ee2bcaa576f20af254c7cd84b8efb2715abf54a..930c0b8918253d6acfe26a4fd1cd57837acbf728 100755 (executable)
--- a/deblob-2.6.33
+++ b/deblob-2.6.33
@@ -45,7 +45,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.33 extra=-- # up to -rc7
+kver=2.6.33 extra=0++
 
 case $1 in
 --force)
@@ -1518,7 +1518,7 @@ announce BT_MRVL_SDIO - "Marvell BT-over-SDIO driver"
 reject_firmware drivers/bluetooth/btmrvl_sdio.c
 clean_blob drivers/bluetooth/btmrvl_sdio.c
 clean_blob Documentation/btmrvl.txt
-clean_kconfig drivers/bluetooth/Kcofnig 'BT_MRVL_SDIO'
+clean_kconfig drivers/bluetooth/Kconfig 'BT_MRVL_SDIO'
 clean_mk CONFIG_BT_MRVL_SDIO drivers/bluetooth/Makefile
 
 # wimax
@@ -2023,10 +2023,11 @@ clean_sed '
 clean_mk CONFIG_SOUND_MSNDPIN sound/oss/Makefile
 
 announce SND_SSCAPE - "Ensoniq SoundScape driver"
+reject_firmware sound/isa/sscape.c
 clean_blob sound/isa/sscape.c
 clean_sed '
 /^config SND_SSCAPE$/, /^config / {
-  s,"\(scope\|sndscape\)\.co[d?]","/*(DEBLOBBED)*/",;
+  s,"\(scope\|sndscape\)\.co[d?]","/*(DEBLOBBED)*/",g;
 }' sound/isa/Kconfig 'removed firmware names'
 clean_kconfig sound/isa/Kconfig 'SND_SSCAPE'
 clean_mk CONFIG_SND_SSCAPE sound/isa/Makefile