Commit 2ff56fad authored Oct 15, 2015 by Russell King Committed by Mauro Carvalho Chehab Nov 19, 2015

[media] rc: allow rc modules to be loaded if rc-main is not a module



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: 631493ec ("[media] rc-core: merge rc-map.c into rc-main.c")

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent d2cc2f0b

drivers/media/rc/rc-main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ struct rc_map rc_map_get(const char name)
		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) {

Admin message