[media] rc: allow rc modules to be loaded if rc-main is not a module
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 15 Oct 2015 16:15:24 +0000 (13:15 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 19 Nov 2015 10:41:06 +0000 (08:41 -0200)
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@arm.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/rc/rc-main.c

index 3f0f71adabb4dbba061ef57e1f798ca0e9187c77..ea1008cf14a31b870ada96b417ae0004047e381b 100644 (file)
@@ -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) {
This page took 0.026348 seconds and 5 git commands to generate.