Skip to contentSkip to conversation

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

PATCH New Russell King 1 participant 1 message Oct 15, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 631493ecacd8 ("[media] rc-core: merge rc-map.c into rc-main.c")
---
 drivers/media/rc/rc-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/rc-main.c +1 -1
index a639ea653c7e..70af646ca397 100644
@@ -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) {
Signature · 1 line
2.1.0