X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-4.16;h=dab4681b36850b54a1850ce9a6d20bf91aab5460;hb=29d8370116814c5960655587f15076cd0305e775;hp=1b3f623d8cca9afbd1bcc23833aadb1083df3fd2;hpb=a35a1ad171e023d884ee9522ead34b41be6101e9;p=releases.git

diff --git a/deblob-4.16 b/deblob-4.16
index 1b3f623d8cca..dab4681b3685 100755
--- a/deblob-4.16
+++ b/deblob-4.16
@@ -501,7 +501,7 @@ reject_firmware_nowait(struct module *module, int uevent,\
 	report_missing_free_firmware(dev_name(device), NULL);\
 	/* We assume NONFREE_FIRMWARE will not be found; how could it?  */\
 	return request_firmware_nowait(module, uevent, NONFREE_FIRMWARE,\
-				       device, gfp, NULL, cont);\
+				       device, gfp, context, cont);\
 }\
 static inline int\
 maybe_reject_firmware_nowait(struct module *module, int uevent,\
@@ -3132,11 +3132,7 @@ clean_blob sound/pci/rme9652/hdsp.c
 clean_kconfig sound/pci/Kconfig SND_HDSP
 clean_mk CONFIG_SND_HDSP sound/pci/rme9652/Makefile
 
-announce SND_AICA - "Dreamcast Yamaha AICA sound"
-reject_firmware sound/sh/aica.c
-clean_blob sound/sh/aica.c
-clean_kconfig sound/sh/Kconfig SND_AICA
-clean_mk CONFIG_SND_AICA sound/sh/Makefile
+# SND_AICA is no longer disabled, its firmware is Free Software.
 
 announce SND_MSND_PINNACLE - "Support for Turtle Beach MultiSound Pinnacle"
 clean_blob sound/isa/msnd/msnd_pinnacle.h