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)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 13 Feb 2016 10:34:03 +0000 (10:34 +0000)
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@arm.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

No differences found