This is a note to let you know that I've just added the patch titled [media] rc: allow rc modules to be loaded if rc-main is not a module to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: rc-allow-rc-modules-to-be-loaded-if-rc-main-is-not-a-module.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 2ff56fadd94cdaeeaeccbc0a9b703a0101ada128 Mon Sep 17 00:00:00 2001 From: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Date: Thu, 15 Oct 2015 13:15:24 -0300 Subject: [media] rc: allow rc modules to be loaded if rc-main is not a module From: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> commit 2ff56fadd94cdaeeaeccbc0a9b703a0101ada128 upstream. rc-main mistakenly uses #ifdef MODULE to determine whether it should load the rc keymap modules. This symbol is only defined if rc-main is being built as a module itself, and bears no relation to whether the rc keymaps are modules. Fix this to use CONFIG_MODULES instead. Fixes: 631493ecacd8 ("[media] rc-core: merge rc-map.c into rc-main.c") Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/media/rc/rc-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -61,7 +61,7 @@ struct rc_map *rc_map_get(const char *na struct rc_map_list *map; map = seek_rc_map(name); -#ifdef MODULE +#ifdef CONFIG_MODULES if (!map) { int rc = request_module("%s", name); if (rc < 0) { Patches currently in stable-queue which might be from rmk+kernel@xxxxxxxxxxxxxxxx are queue-4.4/mmc-sd-limit-sd-card-power-limit-according-to-cards-capabilities.patch queue-4.4/rc-allow-rc-modules-to-be-loaded-if-rc-main-is-not-a-module.patch