diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2015-10-15 13:15:24 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-11-19 08:41:06 -0200 |
| commit | 2ff56fadd94cdaeeaeccbc0a9b703a0101ada128 (patch) | |
| tree | 90b8081aae748b3c8c4a41a1117efe61dc5b3b29 /drivers/media/rc/rc-main.c | |
| parent | [media] si2157: return -EINVAL if firmware blob is too big (diff) | |
| download | linux-dev-2ff56fadd94cdaeeaeccbc0a9b703a0101ada128.tar.xz linux-dev-2ff56fadd94cdaeeaeccbc0a9b703a0101ada128.zip | |
[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: 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>
Diffstat (limited to 'drivers/media/rc/rc-main.c')
| -rw-r--r-- | drivers/media/rc/rc-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 3f0f71adabb4..ea1008cf14a3 100644 --- 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 *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) { |